Skip to content

Commit

Permalink
chore: bump Go and Alpine (#207)
Browse files Browse the repository at this point in the history
  • Loading branch information
giautm authored Oct 13, 2024
1 parent 36b495a commit d7bc936
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 13 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.

# Build the manager binary
FROM golang:1.22.2-alpine3.19 as builder
FROM golang:1.23-alpine3.20 as builder
ARG TARGETOS
ARG TARGETARCH
ARG OPERATOR_VERSION
Expand All @@ -40,13 +40,13 @@ RUN --mount=type=cache,target=/go/pkg/mod \
go build -ldflags "-X 'main.version=${OPERATOR_VERSION}'" \
-o manager -a cmd/main.go

FROM alpine:3.19 as atlas
FROM alpine:3.20 as atlas
RUN apk add --no-cache curl
ARG ATLAS_VERSION=latest
ENV ATLAS_VERSION=${ATLAS_VERSION}
RUN curl -sSf https://atlasgo.sh | sh

FROM alpine:3.19
FROM alpine:3.20
WORKDIR /
COPY --from=builder /workspace/manager .
COPY --from=atlas /usr/local/bin/atlas /usr/local/bin
Expand Down
7 changes: 0 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -230,13 +230,6 @@ cli-gen: generate manifests chart-manifests license
chart-manifests: manifests license kustomize
$(KUSTOMIZE) build config/crd -o charts/atlas-operator/templates/crds/crd.yaml

.PHONY: integration-tests
integration-tests:
skaffold run --wait-for-connection=true -p integration
$(MAKE) install
./scripts/integration-tests.sh
$(MAKE) undeploy ignore-not-found=true

# go-install-tool will 'go install' any package with custom target and name of binary, if it doesn't exist
# $1 - target path with name of binary
# $2 - package url which can be installed
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/ariga/atlas-operator

go 1.22

toolchain go1.22.0
go 1.23

require (
ariga.io/atlas v0.21.2-0.20240424054305-cf871e4a7c1e
Expand Down

0 comments on commit d7bc936

Please sign in to comment.