Update.

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

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/devcontainer.yml b/.github/workflows/devcontainer.yml
@@ -22,8 +22,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/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -70,8 +70,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
@@ -87,13 +87,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/.gitlab/workflows/devcontainer.yml b/.gitlab/workflows/devcontainer.yml
@@ -20,8 +20,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/.gitlab/workflows/release.yml b/.gitlab/workflows/release.yml
@@ -45,8 +45,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 \
@@ -57,12 +57,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