Skip to content

Commit

Permalink
Merge pull request #25 from uselagoon/multiarch-image
Browse files Browse the repository at this point in the history
build: enable multiarch image and update GHA
  • Loading branch information
shreddedbacon authored Apr 26, 2024
2 parents c856d24 + 13da7ac commit 21eedd8
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 21 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/aergia-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
experimental: true
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: "0"
- name: Set up testing dependencies
run: sudo apt-get update && sudo apt-get -y install build-essential && sudo apt-get clean
- name: Setup correct Go version
uses: actions/setup-go@v2
uses: actions/setup-go@v5
with:
go-version: '1.21'
- name: Install kustomize, kubebuilder, helm
Expand All @@ -53,14 +53,14 @@ jobs:
node_image: kindest/node:${{ matrix.kindest_node_version }}
config: test-resources/kind-cluster.yaml
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3
- name: Build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
context: .
load: true
tags: amazeeiolocal/aergia:test-tag
tags: testlagoon/aergia:test-tag
- name: Run Tests
run: |
kind load docker-image amazeeiolocal/aergia:test-tag --name chart-testing
kind load docker-image testlagoon/aergia:test-tag --name chart-testing
make controller-test
23 changes: 11 additions & 12 deletions .github/workflows/build_and_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,42 +16,41 @@ jobs:
steps:
-
name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
-
name: Docker meta
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v5
with:
# list of Docker images to use as base name for tags
images: |
amazeeio/aergia
ghcr.io/amazeeio/aergia
uselagoon/aergia
ghcr.io/uselagoon/aergia
-
name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3
-
name: Login to DockerHub
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Login to GHCR
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ COPY handlers/ handlers/
COPY controllers/ controllers/

# Build
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager main.go metrics.go
RUN CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} GO111MODULE=on go build -a -o manager main.go metrics.go

# Use distroless as minimal base image to package the manager binary
# Refer to https://github.com/GoogleContainerTools/distroless for more details
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# Image URL to use all building/pushing image targets
IMG ?= amazeeiolocal/aergia:test-tag
IMG ?= testlagoon/aergia:test-tag
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
CRD_OPTIONS ?= "crd:trivialVersions=true"

Expand Down
2 changes: 1 addition & 1 deletion test-resources/aergia-backend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ spec:
name: backend
command:
- /manager
image: amazeeiolocal/aergia:test-tag
image: testlagoon/aergia:test-tag
name: manager
resources:
limits:
Expand Down

0 comments on commit 21eedd8

Please sign in to comment.