summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortechknowlogick <techknowlogick@gitea.io>2019-12-26 19:52:32 -0500
committerGitHub <noreply@github.com>2019-12-26 19:52:32 -0500
commitd86e5871869a32b7b8dddc688641d2c4257b740d (patch)
tree041f833bdbefa8705bcdf2383d219d443ef95294
parent5748755e8ecf1063c2e78a8f114bd60ad55fdae5 (diff)
downloadgitea-d86e5871869a32b7b8dddc688641d2c4257b740d.tar.gz
gitea-d86e5871869a32b7b8dddc688641d2c4257b740d.zip
alpine 3.11 (#9440)
-rw-r--r--.drone.yml2
-rw-r--r--Dockerfile4
2 files changed, 3 insertions, 3 deletions
diff --git a/.drone.yml b/.drone.yml
index 99c3f4bdd4..7a844af8eb 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -326,7 +326,7 @@ steps:
- name: update
pull: default
- image: alpine:3.10
+ image: alpine:3.11
commands:
- mv ./options/locale/locale_en-US.ini ./options/
- "sed -i -e 's/=\"/=/g' -e 's/\"$$//g' ./options/locale/*.ini"
diff --git a/Dockerfile b/Dockerfile
index ee0418c92c..bc8ac4f4be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
###################################
#Build stage
-FROM golang:1.13-alpine3.10 AS build-env
+FROM golang:1.13-alpine3.11 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 build
-FROM alpine:3.10
+FROM alpine:3.11
LABEL maintainer="maintainers@gitea.io"
EXPOSE 22 3000