ci: test dockerimage with more unique version identifier (#453)

Signed-off-by: Jan Kowalleck <[email protected]>
CycloneDX · Dec 11, 2022 · 5a7fb9a · 5a7fb9a
1 parent bf133a3
commit 5a7fb9a
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -30,7 +30,6 @@ jobs:
           fetch-depth: 0
       - name: setup reports-dir
         run: mkdir "$REPORTS_DIR"
-
       - name: Setup python ${{ env.PYTHON_VERISON }}
         # see https://github.com/actions/setup-python
         uses: actions/setup-python@v4
@@ -41,7 +40,12 @@ jobs:
         uses: Gr1N/setup-poetry@v7
         with:
           poetry-version: ${{ env.POETRY_VERSION }}
-
+      - name: bump version
+        id: bump-version
+        run: |
+          VERSION="${{ github.run_id }}.${{ github.run_number }}.${{ github.run_attempt }}+testing"
+          poetry version "$VERSION"
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
       - name: Poetry build
         run: poetry build
       - name: Artifact python dist
@@ -54,22 +58,14 @@ jobs:
           name: ${{ env.RUN_ARTIFACT_PYTHON_DIST }}
           path: ${{ env.DIST_SOURCE_DIR }}/
           if-no-files-found: warn
-
-      - name: post-hook
-        id: after-build
-        run: |
-          VERSION="$(poetry version --short --no-interaction --no-ansi)"
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-
       - name: Build Docker image
         env:
-          VERSION: ${{ steps.after-build.outputs.version }}
+          VERSION: ${{ steps.bump-version.outputs.version }}
         run: >
           docker build -f Dockerfile
           --build-arg "VERSION=$VERSION"
           -t "$DOCKER_TAG"
           .
-
       - name: Build own SBoM (XML)
         run: >
           docker run --rm "$DOCKER_TAG"
@@ -92,7 +88,6 @@ jobs:
           name: ${{ env.REPORTS_ARTIFACT }}
           path: ${{ env.REPORTS_DIR }}
           if-no-files-found: error
-
       - name: Destroy Docker image
         # run regardless of outcome
         if: ${{ always() }}