From 6c109cab449c94defa2bc5d3ef592f1f70626e89 Mon Sep 17 00:00:00 2001 From: Slava <20563034+veaceslavdoina@users.noreply.github.com> Date: Mon, 24 Feb 2025 14:21:03 +0200 Subject: [PATCH] docker: adjust dockerfile and workflow for arm64 builds --- .github/workflows/docker.yml | 2 ++ docker/deluge.Dockerfile | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d2526f47e..283c6c72a 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -24,4 +24,6 @@ jobs: docker_file: docker/deluge.Dockerfile dockerhub_repo: codexstorage/deluge tag_latest: ${{ github.ref_name == github.event.repository.default_branch || startsWith(github.ref, 'refs/tags/') }} + checkout-fetch-depth: 0 + checkout-fetch-tags: true secrets: inherit diff --git a/docker/deluge.Dockerfile b/docker/deluge.Dockerfile index 835afef05..4fff09d68 100644 --- a/docker/deluge.Dockerfile +++ b/docker/deluge.Dockerfile @@ -28,9 +28,15 @@ RUN conda create -y -n 'deluge' python=3.8 RUN conda init bash RUN echo "conda activate deluge" > ~/.bashrc -RUN conda install -y anaconda::py-boost\ - anaconda::gxx_linux-64\ - anaconda:openssl +RUN if [ $(uname -m) = "aarch64" ]; then \ + conda install -y anaconda::py-boost \ + anaconda::gxx_linux-aarch64 \ + anaconda:openssl; \ + else \ + conda install -y anaconda::py-boost \ + anaconda::gxx_linux-64 \ + anaconda:openssl; \ + fi COPY . ./