From a3368c5c9d09bf1e85801207db82f7994697e23e Mon Sep 17 00:00:00 2001 From: Ulthran Date: Mon, 1 Apr 2024 16:29:35 -0400 Subject: [PATCH] Pass SUNBEAM_VER from workflow to Dockerfiles --- .github/workflows/dockerhub.yml | 2 ++ Dockerfile | 3 ++- slim.Dockerfile | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml index 0e19ec4a..0383f6d2 100644 --- a/.github/workflows/dockerhub.yml +++ b/.github/workflows/dockerhub.yml @@ -60,6 +60,7 @@ jobs: push: true tags: sunbeamlabs/sunbeam:latest, sunbeamlabs/sunbeam:${{ steps.get_version.outputs.version-without-v }} labels: ${{ steps.meta.outputs.labels }} + build-args: "SUNBEAM_VER=${{ steps.get_version.outputs.version-without-v }}" - name: Build and push slim Docker image uses: docker/build-push-action@v5 @@ -69,6 +70,7 @@ jobs: push: true tags: sunbeamlabs/sunbeam:${{ steps.get_version.outputs.version-without-v }}-slim labels: ${{ steps.meta.outputs.labels }} + build-args: "SUNBEAM_VER=${{ steps.get_version.outputs.version-without-v }}" push-cutadapt-dockerhub: name: Push cutadapt env to Dockerhub diff --git a/Dockerfile b/Dockerfile index 79859b43..cd408599 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,7 @@ FROM condaforge/mambaforge:latest # Setup WORKDIR /home/sunbeam +ARG SUNBEAM_VER RUN mkdir -p etc/ COPY etc/* etc/ @@ -26,7 +27,7 @@ RUN ./install.sh -e sunbeam -v ENV PATH="/opt/conda/envs/sunbeam/bin/:${PATH}" ENV SUNBEAM_DIR="/home/sunbeam" -ENV SUNBEAM_VER="4.4.0" +ENV SUNBEAM_VER ${SUNBEAM_VER} ENV SUNBEAM_MIN_MEM_MB="8000" ENV SUNBEAM_MIN_RUNTIME="60" diff --git a/slim.Dockerfile b/slim.Dockerfile index 2c5f9c43..effae024 100644 --- a/slim.Dockerfile +++ b/slim.Dockerfile @@ -2,6 +2,7 @@ FROM condaforge/mambaforge:latest # Setup WORKDIR /home/sunbeam +ARG SUNBEAM_VER RUN mkdir -p etc/ COPY etc/* etc/ @@ -26,7 +27,7 @@ RUN ./install.sh -e sunbeam -v ENV PATH="/opt/conda/envs/sunbeam/bin/:${PATH}" ENV SUNBEAM_DIR="/home/sunbeam" -ENV SUNBEAM_VER="4.4.0" +ENV SUNBEAM_VER ${SUNBEAM_VER} ENV SUNBEAM_MIN_MEM_MB="8000" ENV SUNBEAM_MIN_RUNTIME="60"