Fix cache registry references

This commit is contained in:
Andrew Dryga
2023-10-25 13:52:50 -06:00
parent d5e182cf0a
commit 34cb88f5af
2 changed files with 11 additions and 19 deletions

View File

@@ -168,10 +168,7 @@ jobs:
- name: Push binaries
uses: softprops/action-gh-release@v1
with:
name:
${{
needs.update-release-draft.steps.update-release-draft.outputs.name
}}
name: ${{ needs.update-release-draft.steps.update-release-draft.outputs.name }}
draft: true
files: |
rust/${{ env.BINARY_DEST_PATH }}*
@@ -193,9 +190,7 @@ jobs:
id: meta
uses: docker/metadata-action@v5
with:
images:
${{ steps.login.outputs.registry }}/firezone/${{
matrix.name.artifact }}
images: ${{ steps.login.outputs.registry }}/firezone/${{ matrix.name.artifact }}
tags: |
type=raw,value=${{ github.sha }}
type=raw,value=${{ env.VERSION }}
@@ -209,14 +204,11 @@ jobs:
TARGET=${{ matrix.arch.target }}
context: rust
cache-from: |
type=registry,ref=${{ steps.login.outputs.registry }}/firezone/cache/${{ matrix.name.artifact }}:main
type=registry,ref=${{ steps.login.outputs.registry }}/cache/${{ matrix.name.artifact }}:main
cache-to: |
type=registry,ref=${{ steps.login.outputs.registry }}/firezone/cache/${{ matrix.name.artifact }}:main
type=registry,ref=${{ steps.login.outputs.registry }}/cache/${{ matrix.name.artifact }}:main
target: release
outputs:
type=image,name=${{ steps.login.outputs.registry }}/firezone/${{
matrix.name.artifact
}},push-by-digest=true,name-canonical=true,push=true
outputs: type=image,name=${{ steps.login.outputs.registry }}/firezone/${{ matrix.name.artifact}},push-by-digest=true,name-canonical=true,push=true
- name: Export digest
run: |
mkdir -p /tmp/digests/${{ matrix.name.artifact }}

View File

@@ -53,7 +53,7 @@ services:
build:
context: elixir
cache_from:
- type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/firezone/cache/web:main
- type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/cache/web:main
args:
APPLICATION_NAME: web
image: us-east1-docker.pkg.dev/firezone-staging/firezone/web:${VERSION:-main}
@@ -121,7 +121,7 @@ services:
context: rust
dockerfile: Dockerfile
cache_from:
- type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/firezone/cache/client:main
- type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/cache/client:main
args:
PACKAGE: firezone-linux-client
image: us-east1-docker.pkg.dev/firezone-staging/firezone/client:${VERSION:-main}
@@ -158,7 +158,7 @@ services:
context: rust
dockerfile: Dockerfile
cache_from:
- type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/firezone/cache/gateway:main
- type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/cache/gateway:main
args:
PACKAGE: firezone-gateway
image: us-east1-docker.pkg.dev/firezone-staging/firezone/gateway:${VERSION:-main}
@@ -210,7 +210,7 @@ services:
context: rust
dockerfile: Dockerfile
cache_from:
- type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/firezone/cache/relay:main
- type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/cache/relay:main
args:
PACKAGE: firezone-relay
image: us-east1-docker.pkg.dev/firezone-staging/firezone/relay:${VERSION:-main}
@@ -238,7 +238,7 @@ services:
build:
context: elixir
cache_from:
- type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/firezone/cache/api:main
- type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/cache/api:main
args:
APPLICATION_NAME: api
image: us-east1-docker.pkg.dev/firezone-staging/firezone/api:${VERSION:-main}
@@ -309,7 +309,7 @@ services:
context: elixir
target: compiler
cache_from:
- type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/firezone/cache/elixir:main
- type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/cache/elixir:main
args:
APPLICATION_NAME: api
image: us-east1-docker.pkg.dev/firezone-staging/firezone/elixir:${VERSION:-main}