revert to use alpine 3.13 (#16452)

Co-authored-by: zeripath <art27@cantab.net>
release/v1.15
techknowlogick 2021-07-15 21:55:14 -04:00 committed by GitHub
parent e5fde7ef00
commit 0877d497f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions

View File

@ -404,7 +404,7 @@ steps:
- name: update - name: update
pull: default pull: default
image: alpine:3.14 image: alpine:3.13
commands: commands:
- ./build/update-locales.sh - ./build/update-locales.sh

View File

@ -1,7 +1,7 @@
################################### ###################################
#Build stage #Build stage
FROM golang:1.16-alpine3.14 AS build-env FROM golang:1.16-alpine3.13 AS build-env
ARG GOPROXY ARG GOPROXY
ENV GOPROXY ${GOPROXY:-direct} ENV GOPROXY ${GOPROXY:-direct}
@ -25,7 +25,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
# Begin env-to-ini build # Begin env-to-ini build
RUN go build contrib/environment-to-ini/environment-to-ini.go RUN go build contrib/environment-to-ini/environment-to-ini.go
FROM alpine:3.14 FROM alpine:3.13
LABEL maintainer="maintainers@gitea.io" LABEL maintainer="maintainers@gitea.io"
EXPOSE 22 3000 EXPOSE 22 3000

View File

@ -1,7 +1,7 @@
################################### ###################################
#Build stage #Build stage
FROM golang:1.16-alpine3.14 AS build-env FROM golang:1.16-alpine3.13 AS build-env
ARG GOPROXY ARG GOPROXY
ENV GOPROXY ${GOPROXY:-direct} ENV GOPROXY ${GOPROXY:-direct}
@ -25,7 +25,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
# Begin env-to-ini build # Begin env-to-ini build
RUN go build contrib/environment-to-ini/environment-to-ini.go RUN go build contrib/environment-to-ini/environment-to-ini.go
FROM alpine:3.14 FROM alpine:3.13
LABEL maintainer="maintainers@gitea.io" LABEL maintainer="maintainers@gitea.io"
EXPOSE 2222 3000 EXPOSE 2222 3000