From 7538b2f86066957cd8318b78592e38abe0a9bc6a Mon Sep 17 00:00:00 2001 From: risson <18313093+rissson@users.noreply.github.com> Date: Fri, 21 Apr 2023 12:36:35 +0200 Subject: [PATCH] ci: add docker tag without timestamp (#5325) * ci: add docker tag without timestamp Signed-off-by: Marc 'risson' Schmitt * ci: outposts: build for arm64 as well, align tags with main build Signed-off-by: Marc 'risson' Schmitt * ci: remove branch name from sha-only tag Signed-off-by: Marc 'risson' Schmitt * fix outposts images base Signed-off-by: Marc 'risson' Schmitt * remove useless changes Signed-off-by: Marc 'risson' Schmitt * remove useless outpost container tag Signed-off-by: Marc 'risson' Schmitt * fix dev-server arm new tag name Signed-off-by: Marc 'risson' Schmitt --------- Signed-off-by: Marc 'risson' Schmitt --- .github/workflows/ci-main.yml | 2 ++ .github/workflows/ci-outpost.yml | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index b83257ebf..67e466f9c 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -212,6 +212,7 @@ jobs: push: ${{ steps.ev.outputs.shouldBuild == 'true' }} tags: | ghcr.io/goauthentik/dev-server:gh-${{ steps.ev.outputs.branchNameContainer }} + ghcr.io/goauthentik/dev-server:gh-${{ steps.ev.outputs.sha }} ghcr.io/goauthentik/dev-server:gh-${{ steps.ev.outputs.branchNameContainer }}-${{ steps.ev.outputs.timestamp }}-${{ steps.ev.outputs.shortHash }} build-args: | GIT_BUILD_HASH=${{ steps.ev.outputs.sha }} @@ -253,6 +254,7 @@ jobs: push: ${{ steps.ev.outputs.shouldBuild == 'true' }} tags: | ghcr.io/goauthentik/dev-server:gh-${{ steps.ev.outputs.branchNameContainer }}-arm64 + ghcr.io/goauthentik/dev-server:gh-${{ steps.ev.outputs.sha }}-arm64 ghcr.io/goauthentik/dev-server:gh-${{ steps.ev.outputs.branchNameContainer }}-${{ steps.ev.outputs.timestamp }}-${{ steps.ev.outputs.shortHash }}-arm64 build-args: | GIT_BUILD_HASH=${{ steps.ev.outputs.sha }} diff --git a/.github/workflows/ci-outpost.yml b/.github/workflows/ci-outpost.yml index 5d267ac97..1b8df0e3c 100644 --- a/.github/workflows/ci-outpost.yml +++ b/.github/workflows/ci-outpost.yml @@ -60,8 +60,6 @@ jobs: - proxy - ldap - radius - arch: - - "linux/amd64" runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -94,7 +92,7 @@ jobs: build-args: | GIT_BUILD_HASH=${{ steps.ev.outputs.sha }} VERSION_FAMILY=${{ steps.ev.outputs.versionFamily }} - platforms: ${{ matrix.arch }} + platforms: linux/amd64,linux/arm64 context: . build-binary: timeout-minutes: 120