diff options
| author | techknowlogick <techknowlogick@gitea.io> | 2020-06-03 16:32:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-03 16:32:51 -0400 |
| commit | a3b185d54c1a2a942b105b706ea61af31200060f (patch) | |
| tree | 859d5cf06ca33b9e0d0bcd8b5d00c42f3f1a1068 | |
| parent | 2b2373f6c2f202cb7b6f25f281ac7b148b69a81f (diff) | |
| download | gitea-a3b185d54c1a2a942b105b706ea61af31200060f.tar.gz gitea-a3b185d54c1a2a942b105b706ea61af31200060f.zip | |
Alpine 3.12 (#11720)
* increase alpine to 3.12
* Update .drone.yml
| -rw-r--r-- | .drone.yml | 4 | ||||
| -rw-r--r-- | Dockerfile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.drone.yml b/.drone.yml index ac8c929181..1b68e212e2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -160,7 +160,7 @@ steps: - name: tag-pre-condition pull: always - image: alpine/git + image: drone/git commands: - git update-ref refs/heads/tag_test ${DRONE_COMMIT_SHA} @@ -366,7 +366,7 @@ steps: - name: update pull: default - image: alpine:3.11 + image: alpine:3.12 commands: - ./build/update-locales.sh diff --git a/Dockerfile b/Dockerfile index 8093853605..d029efed49 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ################################### #Build stage -FROM golang:1.14-alpine3.11 AS build-env +FROM golang:1.14-alpine3.12 AS build-env ARG GOPROXY ENV GOPROXY ${GOPROXY:-direct} @@ -21,7 +21,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.11 +FROM alpine:3.12 LABEL maintainer="maintainers@gitea.io" EXPOSE 22 3000 |