Update template.

serious-scaffold · Feb 6, 2024 · 067c8ab · 067c8ab
1 parent d0086d4
commit 067c8ab
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/...% if repo_host_type == 'github.com' %].github[% endif %]/workflows/devcontainer.yml.jinja b/...% if repo_host_type == 'github.com' %].github[% endif %]/workflows/devcontainer.yml.jinja
@@ -23,8 +23,8 @@ jobs:
         with:
           build-args: |
             PYTHON_VERSION={{ '${{ matrix.python-version }}' }}
-          cache-from: type=registry,ref=ghcr.io/{{ '${{ github.repository }}' }}/build-cache-dev:py{{ '${{ matrix.python-version }}' }}
-          cache-to: type=registry,ref=ghcr.io/{{ '${{ github.repository }}' }}/build-cache-dev:py{{ '${{ matrix.python-version }}' }},mode=max
+          cache-from: type=registry,ref=ghcr.io/{{ '${{ github.repository }}' }}/dev-cache:py{{ '${{ matrix.python-version }}' }}
+          cache-to: type=registry,ref=ghcr.io/{{ '${{ github.repository }}' }}/dev-cache:py{{ '${{ matrix.python-version }}' }},mode=max
           file: .devcontainer/Dockerfile
           provenance: false
           push: true

diff --git a/...ate/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/release.yml.jinja b/...ate/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/release.yml.jinja
@@ -71,8 +71,8 @@ jobs:
         with:
           build-args: |
             PYTHON_VERSION={{ '${{ matrix.python-version }}' }}
-          cache-from: type=registry,ref=ghcr.io/{{ '${{ github.repository }}' }}/build-cache-dev:py{{ '${{ matrix.python-version }}' }}
-          cache-to: type=registry,ref=ghcr.io/{{ '${{ github.repository }}' }}/build-cache-dev:py{{ '${{ matrix.python-version }}' }},mode=max
+          cache-from: type=registry,ref=ghcr.io/{{ '${{ github.repository }}' }}/dev-cache:py{{ '${{ matrix.python-version }}' }}
+          cache-to: type=registry,ref=ghcr.io/{{ '${{ github.repository }}' }}/dev-cache:py{{ '${{ matrix.python-version }}' }},mode=max
           file: .devcontainer/Dockerfile
           provenance: false
           push: true
@@ -88,13 +88,13 @@ jobs:
           build-args: |
             PYTHON_VERSION={{ '${{ matrix.python-version }}' }}
             PDM_BUILD_SCM_VERSION={{ '${{ github.ref_name }}' }}
-          cache-from: type=registry,ref=ghcr.io/{{ '${{ github.repository }}' }}/build-cache-dev:py{{ '${{ matrix.python-version }}' }}
+          cache-from: type=registry,ref=ghcr.io/{{ '${{ github.repository }}' }}/dev-cache:py{{ '${{ matrix.python-version }}' }}
           file: .devcontainer/Dockerfile
           provenance: false
           push: true
           tags: |
-            ghcr.io/{{ '${{ github.repository }}' }}/prod:py{{ '${{ matrix.python-version }}' }}
-            ghcr.io/{{ '${{ github.repository }}' }}/prod:py{{ '${{ matrix.python-version }}' }}-{{ '${{ github.ref_name }}' }}
+            ghcr.io/{{ '${{ github.repository }}' }}:py{{ '${{ matrix.python-version }}' }}
+            ghcr.io/{{ '${{ github.repository }}' }}:py{{ '${{ matrix.python-version }}' }}-{{ '${{ github.ref_name }}' }}
           target: prod
     strategy:
       matrix:

diff --git a/..._host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/devcontainer.yml.jinja b/..._host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/devcontainer.yml.jinja
@@ -31,8 +31,8 @@ dev-container-publish:
     - |
       docker buildx build . \
         --build-arg PYTHON_VERSION=${PYTHON_VERSION} \
-        --cache-from type=registry,ref=${CI_REGISTRY_IMAGE}/build-cache-dev:py${PYTHON_VERSION} \
-        --cache-to type=registry,ref=${CI_REGISTRY_IMAGE}/build-cache-dev:py${PYTHON_VERSION},mode=max \
+        --cache-from type=registry,ref=${CI_REGISTRY_IMAGE}/dev-cache:py${PYTHON_VERSION} \
+        --cache-to type=registry,ref=${CI_REGISTRY_IMAGE}/dev-cache:py${PYTHON_VERSION},mode=max \
         --file .devcontainer/Dockerfile \
         --provenance false \
         --push \

diff --git a/... repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/release.yml.jinja b/... repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/release.yml.jinja
@@ -56,8 +56,8 @@ container-publish:
     - |
       docker buildx build . \
         --build-arg PYTHON_VERSION=${PYTHON_VERSION} \
-        --cache-from type=registry,ref=${CI_REGISTRY_IMAGE}/build-cache-dev:py${PYTHON_VERSION} \
-        --cache-to type=registry,ref=${CI_REGISTRY_IMAGE}/build-cache-dev:py${PYTHON_VERSION},mode=max \
+        --cache-from type=registry,ref=${CI_REGISTRY_IMAGE}/dev-cache:py${PYTHON_VERSION} \
+        --cache-to type=registry,ref=${CI_REGISTRY_IMAGE}/dev-cache:py${PYTHON_VERSION},mode=max \
         --file .devcontainer/Dockerfile \
         --provenance false \
         --push \
@@ -68,12 +68,12 @@ container-publish:
       docker buildx build . \
         --build-arg PDM_BUILD_SCM_VERSION=${CI_COMMIT_TAG} \
         --build-arg PYTHON_VERSION=${PYTHON_VERSION} \
-        --cache-from type=registry,ref=${CI_REGISTRY_IMAGE}/build-cache-dev:py${PYTHON_VERSION} \
+        --cache-from type=registry,ref=${CI_REGISTRY_IMAGE}/dev-cache:py${PYTHON_VERSION} \
         --file .devcontainer/Dockerfile \
         --provenance false \
         --push \
-        --tag ${CI_REGISTRY_IMAGE}/prod:py${PYTHON_VERSION} \
-        --tag ${CI_REGISTRY_IMAGE}/prod:py${PYTHON_VERSION}-${CI_COMMIT_TAG} \
+        --tag ${CI_REGISTRY_IMAGE}:py${PYTHON_VERSION} \
+        --tag ${CI_REGISTRY_IMAGE}:py${PYTHON_VERSION}-${CI_COMMIT_TAG} \
         --target prod
   services:
     - docker:dind