From b708968694841cb1df6038eaabb880d0fe59a7f4 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 19 Jan 2021 23:21:01 -0500 Subject: [PATCH] upgrade to alpine 3.13 (#14343) --- .drone.yml | 2 +- Dockerfile | 4 ++-- Dockerfile.rootless | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 74dbf107bd5..0531fb4a585 100644 --- a/.drone.yml +++ b/.drone.yml @@ -404,7 +404,7 @@ steps: - name: update pull: default - image: alpine:3.12 + image: alpine:3.13 commands: - ./build/update-locales.sh diff --git a/Dockerfile b/Dockerfile index 8800738bdee..1376dbdda90 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ################################### #Build stage -FROM golang:1.15-alpine3.12 AS build-env +FROM golang:1.15-alpine3.13 AS build-env ARG GOPROXY ENV GOPROXY ${GOPROXY:-direct} @@ -22,7 +22,7 @@ WORKDIR ${GOPATH}/src/code.gitea.io/gitea RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \ && make clean-all build -FROM alpine:3.12 +FROM alpine:3.13 LABEL maintainer="maintainers@gitea.io" EXPOSE 22 3000 diff --git a/Dockerfile.rootless b/Dockerfile.rootless index 7dbd8b0216c..d20d4d8b8b8 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -1,7 +1,7 @@ ################################### #Build stage -FROM golang:1.15-alpine3.12 AS build-env +FROM golang:1.15-alpine3.13 AS build-env ARG GOPROXY ENV GOPROXY ${GOPROXY:-direct} @@ -22,7 +22,7 @@ WORKDIR ${GOPATH}/src/code.gitea.io/gitea RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \ && make clean-all build -FROM alpine:3.12 +FROM alpine:3.13 LABEL maintainer="maintainers@gitea.io" EXPOSE 2222 3000