Skip to content

Commit ea86caf

Browse files
committed
Upgrade to Go 1.22.x and always use latest Alpine 3.x
1 parent 5b42fcd commit ea86caf

6 files changed

+11
-11
lines changed

Dockerfile.canary-deployer

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.21-alpine as builder
1+
FROM golang:1.22-alpine as builder
22

33
RUN apk add --no-cache git make curl
44
ENV GOOS=linux
@@ -16,7 +16,7 @@ RUN make test
1616
RUN make deploy-alpine
1717

1818

19-
FROM alpine:3.17
19+
FROM alpine:3
2020

2121
WORKDIR /app
2222
RUN apk add --no-cache ca-certificates

Dockerfile.deploy

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.21-alpine as builder
1+
FROM golang:1.22-alpine as builder
22

33
RUN apk add --no-cache git make curl
44
ENV GOOS=linux
@@ -16,7 +16,7 @@ RUN make test
1616
RUN make deploy-alpine
1717

1818

19-
FROM alpine:3.17
19+
FROM alpine:3
2020

2121
WORKDIR /app
2222
RUN apk add --no-cache ca-certificates

Dockerfile.deploy-action

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.21-alpine as builder
1+
FROM golang:1.22-alpine as builder
22

33
RUN apk add --no-cache git make curl
44
ENV GOOS=linux
@@ -16,7 +16,7 @@ RUN make test
1616
RUN make deploy-alpine
1717

1818

19-
FROM alpine:3.19
19+
FROM alpine:3
2020

2121
WORKDIR /app
2222
ENV TZ="Europe/Oslo"

Dockerfile.deployd

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.21-alpine as builder
1+
FROM golang:1.22-alpine as builder
22

33
RUN apk add --no-cache git make curl
44
ENV GOOS=linux
@@ -16,7 +16,7 @@ RUN make test
1616
RUN make deployd-alpine
1717

1818

19-
FROM alpine:3.17
19+
FROM alpine:3
2020

2121
WORKDIR /app
2222
RUN apk add --no-cache ca-certificates

Dockerfile.hookd

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.21-alpine as builder
1+
FROM golang:1.22-alpine as builder
22

33
RUN apk add --no-cache git make curl
44
ENV GOOS=linux
@@ -16,7 +16,7 @@ RUN make test
1616
RUN make hookd-alpine
1717

1818

19-
FROM alpine:3.17
19+
FROM alpine:3
2020

2121
WORKDIR /app
2222
RUN apk add --no-cache ca-certificates

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/nais/deploy
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/aymerick/raymond v2.0.2+incompatible

0 commit comments

Comments
 (0)