From cc95d251d62903d6e96d9cf9c6ce426bec26556f Mon Sep 17 00:00:00 2001
From: Michael Li <alimy@gility.net>
Date: Mon, 13 Aug 2018 20:50:25 +0800
Subject: docker: add new Dockerfile.docker-ce for docker-ce(>=v17.06) to build
 docker image (#5322)

* add new Dockerfile.docker-ce for docker-ce(>=v17.06) to  build docker image

* change default Dockerfile to support docker-ce(>=v17.06) multi-stage build
---
 docker/build.sh    | 10 ++++++----
 docker/finalize.sh |  9 ++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'docker')

diff --git a/docker/build.sh b/docker/build.sh
index 46da4fdd..ebcdb89c 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -23,7 +23,9 @@ rm -r $GOPATH
 # Remove build deps
 apk --no-progress del build-deps
 
-# Create git user for Gogs
-addgroup -S git
-adduser -G git -H -D -g 'Gogs Git User' git -h /data/git -s /bin/bash && usermod -p '*' git && passwd -u git
-echo "export GOGS_CUSTOM=${GOGS_CUSTOM}" >> /etc/profile
+# Move to final place
+mv /app/gogs/build/gogs /app/gogs/
+
+# Cleanup go
+rm -rf /tmp/go
+rm -rf /usr/local/go
diff --git a/docker/finalize.sh b/docker/finalize.sh
index 9adc506a..5880aae3 100755
--- a/docker/finalize.sh
+++ b/docker/finalize.sh
@@ -4,8 +4,10 @@
 set -x
 set -e
 
-# Move to final place
-mv /app/gogs/build/gogs /app/gogs/
+# Create git user for Gogs
+addgroup -S git
+adduser -G git -H -D -g 'Gogs Git User' git -h /data/git -s /bin/bash && usermod -p '*' git && passwd -u git
+echo "export GOGS_CUSTOM=${GOGS_CUSTOM}" >> /etc/profile
 
 # Final cleaning
 rm -rf /app/gogs/build
@@ -14,6 +16,3 @@ rm /app/gogs/docker/build-go.sh
 rm /app/gogs/docker/finalize.sh
 rm /app/gogs/docker/nsswitch.conf
 rm /app/gogs/docker/README.md
-
-rm -rf /tmp/go
-rm -rf /usr/local/go
-- 
cgit v1.2.3