Added Version to python-notebook dockerfile #TASK-6757

opencb · Dec 18, 2024 · a504309 · a504309
1 parent 3d1dfac
commit a504309
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/manual-deploy-python-notebook.yml b/.github/workflows/manual-deploy-python-notebook.yml
@@ -16,6 +16,10 @@ on:
         description: 'Hadoop flavour. Any of: [hdp3.1, hdi5.1, emr6.1, emr6.13]'
         required: false
         default: "hdp3.1"
+      pyopencga_version:
+        type: string
+        description: 'PyOpenCGA version.'
+        required: true
 
 jobs:
   build:
@@ -51,6 +55,6 @@ jobs:
     uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@develop
     needs: build
     with:
-      cli: python3 ./build/cloud/docker/docker-build.py push --images python-notebook --tag ${{ inputs.tag }}
+      cli: python3 ./build/cloud/docker/docker-build.py push --images python-notebook --tag ${{ inputs.tag }} --docker-build-args "-e VERSION=${{ inputs.pyopencga_version }}"
     secrets: inherit
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -43,13 +43,13 @@ jobs:
     uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@develop
     needs: [build-hdp, deploy-python]
     with:
-      cli: python3 ./build/cloud/docker/docker-build.py push --images python-notebook --tag ${{ needs.build-hdp.outputs.version }} --version ${{ needs.build-hdp.outputs.version }}
+      cli: python3 ./build/cloud/docker/docker-build.py push --images python-notebook --tag ${{ needs.build-hdp.outputs.version }} --docker-build-args "-e VERSION=${{ needs.build-hdp.outputs.version }}"
     secrets: inherit
 
   # Add the release job that depends on all the previous jobs
   release:
     uses: opencb/java-common-libs/.github/workflows/release-github-workflow.yml@develop
-    needs: [ build-hdp, deploy-docker-hdp, deploy-maven, deploy-python]
+    needs: [ build-hdp, deploy-docker-hdp, deploy-maven, deploy-python, deploy-docker-python-notebook]
     with:
       artifact: build-folder
       file: |

diff --git a/opencga-app/app/cloud/docker/opencga-python-notebook/Dockerfile b/opencga-app/app/cloud/docker/opencga-python-notebook/Dockerfile
@@ -1,11 +1,11 @@
 # Start from the Jupyter scipy-notebook image
 FROM quay.io/jupyter/scipy-notebook:ubuntu-24.04
-
+ARG VERSION
 USER root
 
 RUN apt-get update && apt-get -y upgrade && \
-    ## Install pyopencga
-    pip install pyopencga && \
+    ## Install pyopencga ${VERSION}
+    pip install pyopencga==${VERSION} && \
     ## Clean downloaded packages to make images smaller
     apt-get clean && rm -rf /var/lib/apt/lists/*