Merge pull request #470 from sunbeam-labs/469-automate-docker-sunbeam…

…-version Pass SUNBEAM_VER from workflow to Dockerfiles
sunbeam-labs · Apr 2, 2024 · ac6bae4 · ac6bae4
2 parents d27b6a1 + a3368c5
commit ac6bae4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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"