Skip to content

Commit

Permalink
Merge pull request #74 from lokalise/feature/CLI-20_apple_m1_binaries
Browse files Browse the repository at this point in the history
CLI-20 Update Go version to 1.16.x
  • Loading branch information
andrewLab-lokalise authored Jul 27, 2021
2 parents 4cc5d49 + f028718 commit 2c07275
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
check:
strategy:
matrix:
go-version: [1.x, 1.13.x]
go-version: [1.x, 1.13.x, 1.16.x]
runs-on: ubuntu-latest

steps:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM alpine:latest as certs
RUN apk --update add ca-certificates

FROM golang:1.13.4-alpine3.10 as builder
FROM golang:1.16-alpine3.14 as builder

RUN mkdir -p /build
WORKDIR /build
Expand All @@ -19,4 +19,4 @@ COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certifica
COPY --from=builder /bin/lokalise2 /bin/lokalise2


CMD ["/bin/lokalise2"]
CMD ["/bin/lokalise2"]
4 changes: 2 additions & 2 deletions Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.4-alpine3.10 as builder
FROM golang:1.16-alpine3.14 as builder

RUN mkdir -p /build
WORKDIR /build
Expand All @@ -10,7 +10,7 @@ COPY . .

RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -installsuffix cgo -o /bin/lokalise2

FROM alpine:3.10
FROM alpine:3.14

RUN apk --update add ca-certificates
COPY --from=builder /bin/lokalise2 /bin/lokalise2
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/lokalise/lokalise-cli-2-go

go 1.13
go 1.16

require (
github.com/go-resty/resty/v2 v2.2.0 // indirect
Expand Down

0 comments on commit 2c07275

Please sign in to comment.