From 6a096811ffb658f575525921fd49bd7f4f0d45a5 Mon Sep 17 00:00:00 2001
From: ᴜɴᴋɴᴡᴏɴ <u@gogs.io>
Date: Tue, 7 Apr 2020 16:00:12 +0800
Subject: docker: bump to Go 1.14 (#6077)

---
 Dockerfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index 6ca3e3a9..a317d790 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,16 @@
-FROM golang:alpine3.10 AS binarybuilder
+FROM golang:alpine3.11 AS binarybuilder
 RUN apk --no-cache --no-progress add --virtual \
   build-deps \
   build-base \
   git \
   linux-pam-dev
 
-WORKDIR /go/src/github.com/gogs/gogs
+WORKDIR /gogs.io/gogs
 COPY . .
-RUN make build-no-gen TAGS="sqlite cert pam"
+RUN make build-no-gen TAGS="cert pam"
 
-FROM alpine:3.10
-ADD https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64 /usr/sbin/gosu
+FROM alpine:3.11
+ADD https://github.com/tianon/gosu/releases/download/1.11/gosu-amd64 /usr/sbin/gosu
 RUN chmod +x /usr/sbin/gosu \
   && echo http://dl-2.alpinelinux.org/alpine/edge/community/ >> /etc/apk/repositories \
   && apk --no-cache --no-progress add \
@@ -33,7 +33,7 @@ COPY docker/nsswitch.conf /etc/nsswitch.conf
 
 WORKDIR /app/gogs
 COPY docker ./docker
-COPY --from=binarybuilder /go/src/github.com/gogs/gogs/gogs .
+COPY --from=binarybuilder /gogs.io/gogs/gogs .
 
 RUN ./docker/finalize.sh
 
-- 
cgit v1.2.3