Skip to content

Commit

Permalink
Merge pull request #115 from uselagoon/fix-image-name
Browse files Browse the repository at this point in the history
chore: revert image name changes
  • Loading branch information
smlx authored Apr 19, 2024
2 parents 1b43025 + ef1dc17 commit 87edb44
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 16 deletions.
12 changes: 4 additions & 8 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ jobs:
contents: read
packages: write
runs-on: ubuntu-latest
strategy:
matrix:
binary:
- lagoon-opensearch-sync
steps:
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
with:
Expand All @@ -38,15 +34,15 @@ jobs:
id: docker_metadata
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
with:
images: ghcr.io/${{ github.repository }}/${{ matrix.binary }}
images: ghcr.io/${{ github.repository }}
- run: echo "GITHUB_REPOSITORY_NAME=$(basename ${{ github.repository }})" >> "$GITHUB_ENV"
- name: Build and push ${{ matrix.binary }} container image
- name: Build and push container image
if: github.actor != 'dependabot[bot]'
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
with:
push: true
tags: ${{ steps.docker_metadata.outputs.tags }}
labels: ${{ steps.docker_metadata.outputs.labels }}
file: Dockerfile
build-args: BINARY=${{ matrix.binary }}
context: dist/${{ matrix.binary }}_linux_amd64_v1
build-args: BINARY=lagoon-opensearch-sync
context: dist/lagoon-opensearch-sync_linux_amd64_v1
16 changes: 8 additions & 8 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,30 +38,30 @@ dockers:
- ids:
- lagoon-opensearch-sync
image_templates:
- "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}/lagoon-opensearch-sync:v{{ .Version }}-amd64"
- "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}:v{{ .Version }}-amd64"
use: buildx
build_flag_templates:
- "--build-arg=BINARY=lagoon-opensearch-sync"
- "--platform=linux/amd64"
- ids:
- lagoon-opensearch-sync
image_templates:
- "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}/lagoon-opensearch-sync:v{{ .Version }}-arm64v8"
- "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}:v{{ .Version }}-arm64v8"
use: buildx
goarch: arm64
build_flag_templates:
- "--build-arg=BINARY=lagoon-opensearch-sync"
- "--platform=linux/arm64/v8"

docker_manifests:
- name_template: "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}/lagoon-opensearch-sync:v{{ .Version }}"
- name_template: "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}:v{{ .Version }}"
image_templates:
- "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}/lagoon-opensearch-sync:v{{ .Version }}-amd64"
- "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}/lagoon-opensearch-sync:v{{ .Version }}-arm64v8"
- name_template: "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}/lagoon-opensearch-sync:latest"
- "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}:v{{ .Version }}-amd64"
- "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}:v{{ .Version }}-arm64v8"
- name_template: "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}:latest"
image_templates:
- "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}/lagoon-opensearch-sync:v{{ .Version }}-amd64"
- "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}/lagoon-opensearch-sync:v{{ .Version }}-arm64v8"
- "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}:v{{ .Version }}-amd64"
- "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}:v{{ .Version }}-arm64v8"

docker_signs:
- args:
Expand Down

0 comments on commit 87edb44

Please sign in to comment.