Merge pull request #95 from smkent/container-version

Fix container build with updated poetry-dynamic-versioning

Author: smkent

tests/test_new_cookie.py

@@ -23,6 +23,7 @@ def test_new_cookie_create(temp_dir: str) -> None:
                 "github_user": "ness.unittest.example",
                 "project_description": "Unit test project",
                 "project_name": "unit-test-1",
+                "enable_container_publish": "yes",
             }
         ),
     ]
@@ -45,3 +46,7 @@ def test_new_cookie_create(temp_dir: str) -> None:
     subprocess.check_call(["poetry", "install"], cwd=project_dir)
     # Run rendered project's tests
     subprocess.check_call(["poetry", "run", "poe", "test"], cwd=project_dir)
+    # Build container for rendered project
+    subprocess.check_call(
+        ["docker", "build", ".", "--no-cache"], cwd=project_dir
+    )

{{cookiecutter.project_name}}/.github/workflows/actions/python-poetry/action.yml

@@ -26,7 +26,7 @@ runs:
         python-version: ${{ "{{" }} inputs.python_version }}
         cache: poetry
 
-    - name: 🛠️ Install project dependencies
+    - name: 🛠️ Install project and dependencies
       shell: bash
       env:
         # https://github.com/python-poetry/poetry/issues/1917
@@ -35,8 +35,10 @@ runs:
       run: |
         poetry install
         poetry lock --check
-        [ "$(poetry version -s)" != "0.0.0" ] \
+        PROJECT_VERSION=$(poetry version -s)
+        [ "${PROJECT_VERSION}" != "0.0.0" ] \
             || { echo "Versioning broken"; exit 1; }
+        echo "PROJECT_VERSION=${PROJECT_VERSION}" >> $GITHUB_ENV
 
     - name: 🪝 Cache pre-commit hooks
       uses: actions/cache@v3

{{cookiecutter.project_name}}/.github/workflows/container.yml

@@ -36,7 +36,7 @@ jobs:
 
       - name: 📡 Collect image metadata
         id: meta
-        uses: docker/metadata-action@v4.1.1
+        uses: docker/metadata-action@v4.3.0
         with:
           images: ${{ "{{" }} env.REGISTRY }}/${{ "{{" }} env.IMAGE_NAME }}
           tags: |
@@ -57,9 +57,11 @@ jobs:
         run: poetry run poe test
 
       - name: 📦 Build and publish container image
-        uses: docker/build-push-action@v3.2.0
+        uses: docker/build-push-action@v4.0.0
         with:
           context: .
           push: ${{ "{{" }} github.event_name != 'pull_request' }}
           tags: ${{ "{{" }} steps.meta.outputs.tags }}
           labels: ${{ "{{" }} steps.meta.outputs.labels }}
+          build-args: |
+            "POETRY_DYNAMIC_VERSIONING_BYPASS=${{ "{{" }} env.PROJECT_VERSION }}"

{{cookiecutter.project_name}}/Dockerfile

@@ -1,4 +1,5 @@
 FROM python:3-alpine
+ARG POETRY_DYNAMIC_VERSIONING_BYPASS="0.0.0"
 RUN apk add --no-cache tini
 COPY docker/entrypoint /