build: Use of poetry 1.7.1 and better docker-compose tag

xchem · Nov 20, 2023 · 72281dc · 72281dc
1 parent 7168ddc
commit 72281dc
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build-dev.yaml b/.github/workflows/build-dev.yaml
@@ -82,7 +82,7 @@ jobs:
       # available between steps in the same job.
       run: |
         pip install --upgrade pip
-        pip install poetry==1.7.0
+        pip install poetry==1.7.1
         poetry export --without-hashes --without dev --output requirements.txt
     - name: Docker build
       uses: docker/build-push-action@v4
@@ -99,7 +99,7 @@ jobs:
 #        --abort-on-container-exit
 #      env:
 #        BE_NAMESPACE: ${{ steps.vars.outputs.BE_NAMESPACE }}
-#        BE_TAG: ${{ env.GITHUB_REF_SLUG }}
+#        BE_IMAGE_TAG: ${{ env.GITHUB_REF_SLUG }}
     - name: Login to DockerHub
       if: steps.vars.outputs.push == 'true'
       uses: docker/login-action@v2

diff --git a/.github/workflows/build-production.yaml b/.github/workflows/build-production.yaml
@@ -126,7 +126,7 @@ jobs:
     - name: Compile requirements.txt
       run: |
         pip install --upgrade pip
-        pip install poetry==1.7.0
+        pip install poetry==1.7.1
         poetry export --without-hashes --without dev --output requirements.txt
     - name: Build
       uses: docker/build-push-action@v4
@@ -143,7 +143,7 @@ jobs:
 #        --abort-on-container-exit
 #      env:
 #        BE_NAMESPACE: ${{ steps.vars.outputs.BE_NAMESPACE }}
-#        BE_TAG: ${{ steps.vars.outputs.tag }}
+#        BE_IMAGE_TAG: ${{ steps.vars.outputs.tag }}
     - name: Login to DockerHub
       if: steps.vars.outputs.push == 'true'
       uses: docker/login-action@v2

diff --git a/.github/workflows/build-staging.yaml b/.github/workflows/build-staging.yaml
@@ -148,7 +148,7 @@ jobs:
     - name: Compile requirements.txt
       run: |
         pip install --upgrade pip
-        pip install poetry==1.7.0
+        pip install poetry==1.7.1
         poetry export --without-hashes --without dev --output requirements.txt
     - name: Docker build
       uses: docker/build-push-action@v4
@@ -163,7 +163,7 @@ jobs:
 #        --abort-on-container-exit
 #      env:
 #        BE_NAMESPACE: ${{ steps.vars.outputs.BE_NAMESPACE }}
-#        BE_TAG: ${{ steps.vars.outputs.tag }}
+#        BE_IMAGE_TAG: ${{ steps.vars.outputs.tag }}
     - name: Login to DockerHub
       if: steps.vars.outputs.push == 'true'
       uses: docker/login-action@v3

diff --git a/build-requirements.txt b/build-requirements.txt
@@ -5,7 +5,7 @@ pylint-django == 2.5.3
 pre-commit == 3.1.1
 
 # Poetry (required to build - see the Dockerfile)
-poetry == 1.5.1
+poetry == 1.7.1
 
 # Matching main requirements...
 Django==3.2.20

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -21,7 +21,7 @@ services:
       start_period: 10s
 
   tests:
-    image: ${BE_NAMESPACE:-xchem}/fragalysis-backend:${BE_TAG:-latest}
+    image: ${BE_NAMESPACE:-xchem}/fragalysis-backend:${BE_IMAGE_TAG:-latest}
     command:
     - /bin/bash
     - /code/test-entry.sh

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -74,7 +74,7 @@ services:
 
   # The stack backend
   backend:
-    image: ${BE_NAMESPACE:-xchem}/fragalysis-backend:${BE_TAG:-latest}
+    image: ${BE_NAMESPACE:-xchem}/fragalysis-backend:${BE_IMAGE_TAG:-latest}
     container_name: backend
     build:
       context: .