From 623ff66f40ed6d8f626bfd8dbe164ff3a902bd6f Mon Sep 17 00:00:00 2001
From: "Shao Yu-Lung (Allen)" <bestlong168@gmail.com>
Date: Thu, 6 Jun 2019 12:25:25 +0800
Subject: [PATCH] Fix ci build failed and nginx adduser error (#2165)

* CI build no need CHANGE_SOURCE
* fix 'adduser: group 'www-data' in use' error
---
 nginx/Dockerfile | 3 +--
 travis-build.sh  | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index c98498f..f7ef409 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -16,8 +16,7 @@ RUN apk update \
     && apk upgrade \
     && apk --update add logrotate \
     && apk add --no-cache openssl \
-    && apk add --no-cache bash \
-    && adduser -D -H -u 1000 -s /bin/bash www-data
+    && apk add --no-cache bash
 
 ARG PHP_UPSTREAM_CONTAINER=php-fpm
 ARG PHP_UPSTREAM_PORT=9000
diff --git a/travis-build.sh b/travis-build.sh
index 18f0910..e773b82 100755
--- a/travis-build.sh
+++ b/travis-build.sh
@@ -30,6 +30,9 @@ if [ -n "${PHP_VERSION}" ]; then
         # memcached extension does not yet support PHP 7.3.
         sed -i -- 's/PHP_FPM_INSTALL_MEMCACHED=true/PHP_FPM_INSTALL_MEMCACHED=false/g' .env
     fi
+
+    sed -i -- 's/CHANGE_SOURCE=true/CHANGE_SOURCE=false/g' .env
+
     cat .env
     docker-compose build ${BUILD_SERVICE}
     docker images