From 350bc83d0072a5eb19d949ae3eb5bae6e74ef0a3 Mon Sep 17 00:00:00 2001 From: flynnnnnnnnnn <118399147+flynnnnnnnnnn@users.noreply.github.com> Date: Fri, 2 Dec 2022 11:23:26 -0500 Subject: [PATCH] Update to Alpine 3.17 (#21904) This pull request is for updating the base docker images to build with the latest version of Alpine. --- .drone.yml | 2 +- Dockerfile | 4 ++-- Dockerfile.rootless | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index d349a5f2fc..1f92d87716 100644 --- a/.drone.yml +++ b/.drone.yml @@ -600,7 +600,7 @@ steps: from_secret: crowdin_key - name: update - image: alpine:3.13 + image: alpine:3.17 pull: always commands: - ./build/update-locales.sh diff --git a/Dockerfile b/Dockerfile index d5d98e69a8..3ee474bb34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ #Build stage -FROM golang:1.19-alpine3.16 AS build-env +FROM golang:1.19-alpine3.17 AS build-env ARG GOPROXY ENV GOPROXY ${GOPROXY:-direct} @@ -23,7 +23,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \ # Begin env-to-ini build RUN go build contrib/environment-to-ini/environment-to-ini.go -FROM alpine:3.16 +FROM alpine:3.17 LABEL maintainer="maintainers@gitea.io" EXPOSE 22 3000 diff --git a/Dockerfile.rootless b/Dockerfile.rootless index 8c2b8e98c9..46a14eae87 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -1,5 +1,5 @@ #Build stage -FROM golang:1.19-alpine3.16 AS build-env +FROM golang:1.19-alpine3.17 AS build-env ARG GOPROXY ENV GOPROXY ${GOPROXY:-direct} @@ -23,7 +23,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \ # Begin env-to-ini build RUN go build contrib/environment-to-ini/environment-to-ini.go -FROM alpine:3.16 +FROM alpine:3.17 LABEL maintainer="maintainers@gitea.io" EXPOSE 2222 3000