From 14870abafc2e851bced38e6fb9d66ac1c8885154 Mon Sep 17 00:00:00 2001 From: Shiloh Heurich Date: Sat, 17 Feb 2024 16:46:54 -0500 Subject: [PATCH] move to oldest supported build/deploy container images --- docker/pebble-challtestsrv/linux.Dockerfile | 2 +- docker/pebble-challtestsrv/windows.Dockerfile | 4 ++-- docker/pebble/linux.Dockerfile | 2 +- docker/pebble/windows.Dockerfile | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/pebble-challtestsrv/linux.Dockerfile b/docker/pebble-challtestsrv/linux.Dockerfile index e187fd14..3afe24e5 100644 --- a/docker/pebble-challtestsrv/linux.Dockerfile +++ b/docker/pebble-challtestsrv/linux.Dockerfile @@ -8,7 +8,7 @@ COPY . . RUN go build -o /go/bin/pebble-challtestsrv ./cmd/pebble-challtestsrv ## main -FROM alpine:3.15.4 +FROM alpine:3.16 COPY --from=builder /go/bin/pebble-challtestsrv /usr/bin/pebble-challtestsrv diff --git a/docker/pebble-challtestsrv/windows.Dockerfile b/docker/pebble-challtestsrv/windows.Dockerfile index 667a19aa..2e1e33f6 100644 --- a/docker/pebble-challtestsrv/windows.Dockerfile +++ b/docker/pebble-challtestsrv/windows.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21-nanoserver-sac2016 as builder +FROM golang:1.21-nanoserver-1809 as builder ENV CGO_ENABLED=0 @@ -8,7 +8,7 @@ COPY . . RUN go install -v ./cmd/pebble-challtestsrv/... ## main -FROM mcr.microsoft.com/windows/nanoserver:sac2016 +FROM mcr.microsoft.com/windows/nanoserver:1809 COPY --from=builder /gopath/bin/pebble-challtestsrv.exe /gopath/bin/pebble-challtestsrv.exe diff --git a/docker/pebble/linux.Dockerfile b/docker/pebble/linux.Dockerfile index 9f2d3d00..cd386b89 100644 --- a/docker/pebble/linux.Dockerfile +++ b/docker/pebble/linux.Dockerfile @@ -8,7 +8,7 @@ COPY . . RUN go build -o /go/bin/pebble ./cmd/pebble ## main -FROM alpine:3.15.4 +FROM alpine:3.16 COPY --from=builder /go/bin/pebble /usr/bin/pebble COPY --from=builder /pebble-src/test/ /test/ diff --git a/docker/pebble/windows.Dockerfile b/docker/pebble/windows.Dockerfile index e56713a3..8d519124 100644 --- a/docker/pebble/windows.Dockerfile +++ b/docker/pebble/windows.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21-nanoserver-sac2016 as builder +FROM golang:1.21-nanoserver-1809 as builder ENV CGO_ENABLED=0 @@ -8,7 +8,7 @@ COPY . . RUN go install -v ./cmd/pebble/... ## main -FROM mcr.microsoft.com/windows/nanoserver:sac2016 +FROM mcr.microsoft.com/windows/nanoserver:1809 COPY --from=builder /gopath/bin/pebble.exe /gopath/bin/pebble.exe COPY --from=builder /pebble-src/test/ /test/