Skip to content
This repository has been archived by the owner on Mar 16, 2024. It is now read-only.

Commit

Permalink
Merge pull request #63 from njhale/bump-go
Browse files Browse the repository at this point in the history
Bump to go 1.20
  • Loading branch information
njhale authored Apr 25, 2023
2 parents 48ca473 + 9f61a53 commit 8064268
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-go@v3
with:
go-version: 1.19
go-version: '1.20'
- run: make setup-ci-env
- run: make validate-ci
- run: make validate
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
FROM golang:1.19 AS build
FROM ghcr.io/acorn-io/images-mirror/golang:1.20-alpine AS build
COPY / /src
WORKDIR /src
ARG TAG="v0.0.0-dev"
ENV CGO_ENABLED=0
RUN --mount=type=cache,target=/go/pkg --mount=type=cache,target=/root/.cache/go-build \
go build -o bin/acorn-dns -ldflags "-s -w -X 'github.com/acorn-io/acorn-dns/pkg/version.Tag=${TAG}'" .

FROM alpine:3.16.2 AS base
FROM ghcr.io/acorn-io/images-mirror/alpine:3.16.2 AS base
RUN apk add --no-cache ca-certificates
RUN adduser -D acorn
# USER acorn commented out so that i can easily get into the container and do stuff to it
ENTRYPOINT ["/usr/local/bin/acorn-dns"]
CMD ["api-server"]

FROM base
COPY --from=build /src/bin/acorn-dns /usr/local/bin/acorn-dns
COPY --from=build /src/bin/acorn-dns /usr/local/bin/acorn-dns
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ image:
docker build .

setup-ci-env:
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.50.0
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.52.2

validate-ci:
go generate
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/acorn-io/acorn-dns

go 1.19
go 1.20

require (
github.com/aws/aws-sdk-go v1.44.114
Expand Down

0 comments on commit 8064268

Please sign in to comment.