From da34fe7f1dede86e533a7a549d4e27eac1dc650f Mon Sep 17 00:00:00 2001 From: Alexander Andryashin Date: Tue, 23 Apr 2024 11:43:13 +0300 Subject: [PATCH 1/2] Multiarch build. --- ci/build.sh | 6 ++---- ci/docker-push.sh | 9 ++++----- ci/test.sh | 1 - go.mod | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ci/build.sh b/ci/build.sh index 07b0bc0..8831341 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -2,7 +2,5 @@ set -e -export GO111MODULE="on" -go install github.com/mitchellh/gox@latest -GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags "-X main.buildStamp=`date -u '+%Y-%m-%d_%I:%M:%S%p'` -X main.gitRevision=`git describe --tags || echo rev:$(git rev-parse HEAD)` -s -w" -gox -os "linux" -arch "386 amd64" -output "dist/{{.Dir}}_{{.OS}}_{{.Arch}}" -ldflags "-X main.buildStamp=`date -u '+%Y-%m-%d_%I:%M:%S%p'` -X main.gitRevision=`git describe --tags || git rev-parse HEAD` -s -w" +GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags "-s -w" -o init-amd64 +GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags "-s -w" -o init-arm64 diff --git a/ci/docker-push.sh b/ci/docker-push.sh index cf46f23..5636f69 100755 --- a/ci/docker-push.sh +++ b/ci/docker-push.sh @@ -4,8 +4,7 @@ set -e docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" docker login quay.io -u="$QUAY_USERNAME" -p="$QUAY_PASSWORD" -docker build -t "$GITHUB_REPOSITORY" -t "$GITHUB_REPOSITORY:$1" -t "quay.io/$GITHUB_REPOSITORY" -t "quay.io/$GITHUB_REPOSITORY:$1" . -docker push "$GITHUB_REPOSITORY" -docker push "$GITHUB_REPOSITORY:$1" -docker push "quay.io/$GITHUB_REPOSITORY" -docker push "quay.io/$GITHUB_REPOSITORY:$1" + +docker buildx build --platform linux/amd64,linux/arm64 --provenance false --push \ + -t $GITHUB_REPOSITORY -t $GITHUB_REPOSITORY:$1 \ + -t quay.io/$GITHUB_REPOSITORY -t quay.io/$GITHUB_REPOSITORY:$1 diff --git a/ci/test.sh b/ci/test.sh index ea14342..77cf2b1 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -1,6 +1,5 @@ #!/bin/bash -export GO111MODULE="on" go test -v -race ./... go install golang.org/x/vuln/cmd/govulncheck@latest diff --git a/go.mod b/go.mod index 917eec8..8f4a85a 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ module github.com/aerokube/init -go 1.19 +go 1.22.2 From c42a86855c2a67fdd68b49f3fe9e4da77aa5afa7 Mon Sep 17 00:00:00 2001 From: Alexander Andryashin Date: Tue, 23 Apr 2024 11:50:00 +0300 Subject: [PATCH 2/2] Fix workflow. --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c825cfd..5806b5e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: - name: Setup Golang uses: actions/setup-go@v2 with: - go-version: ~1.19.3 + go-version: ~1.22.2 - uses: actions/cache@v1 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 839da5d..cf9364d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - name: Setup Golang uses: actions/setup-go@v2 with: - go-version: ~1.19.3 + go-version: ~1.22.2 - uses: actions/cache@v1 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b63d393..172cdc2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: - name: Setup Golang uses: actions/setup-go@v2 with: - go-version: ~1.19.3 + go-version: ~1.22.2 - uses: actions/cache@v1 with: