From 6668f90e18d579658342d2fc3de7f1071ba5a3ad Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Wed, 30 Aug 2023 21:09:56 +0200 Subject: [PATCH 1/2] Fix development Dockerfile to use uptodate images --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3f007f9c5..48ac9f23a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,21 +14,21 @@ # is a lot faster than the build steps below. -FROM owncloudci/nodejs:16 as generate +FROM owncloudci/nodejs:18 as generate COPY ./ /ocis/ WORKDIR /ocis/ocis RUN make ci-node-generate -FROM owncloudci/golang:1.19 as build +FROM owncloudci/golang:1.20 as build COPY --from=generate /ocis /ocis WORKDIR /ocis/ocis RUN make ci-go-generate build -FROM alpine:3.17 +FROM alpine:3.18 RUN apk add --no-cache ca-certificates mailcap tree attr curl && \ echo 'hosts: files dns' >| /etc/nsswitch.conf From 0b2528633dc30bfdd4a9fc2bcd735af2968e8f4a Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Wed, 30 Aug 2023 21:10:51 +0200 Subject: [PATCH 2/2] Bump alpine image to 3.18 --- ocis/docker/Dockerfile.linux.amd64 | 2 +- ocis/docker/Dockerfile.linux.arm64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ocis/docker/Dockerfile.linux.amd64 b/ocis/docker/Dockerfile.linux.amd64 index 84e4c68cd..6b00eda1a 100644 --- a/ocis/docker/Dockerfile.linux.amd64 +++ b/ocis/docker/Dockerfile.linux.amd64 @@ -1,4 +1,4 @@ -FROM amd64/alpine:3.17 +FROM amd64/alpine:3.18 ARG VERSION="" ARG REVISION="" diff --git a/ocis/docker/Dockerfile.linux.arm64 b/ocis/docker/Dockerfile.linux.arm64 index 5e7886d7f..7483d0af5 100644 --- a/ocis/docker/Dockerfile.linux.arm64 +++ b/ocis/docker/Dockerfile.linux.arm64 @@ -1,4 +1,4 @@ -FROM arm64v8/alpine:3.17 +FROM arm64v8/alpine:3.18 ARG VERSION="" ARG REVISION=""