ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ci build failed and nginx adduser error (#2165) 

* CI build no need CHANGE_SOURCE
* fix 'adduser: group 'www-data' in use' error
This commit is contained in:
Shao Yu-Lung (Allen) 2019-06-06 12:25:25 +08:00 committed by GitHub
parent 5bf8be6303
commit 623ff66f40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nginx/Dockerfile
View File

@ -16,8 +16,7 @@ RUN apk update \
&& apk upgrade \ && apk upgrade \
&& apk --update add logrotate \ && apk --update add logrotate \
&& apk add --no-cache openssl \ && apk add --no-cache openssl \
&& apk add --no-cache bash \ && apk add --no-cache bash
&& adduser -D -H -u 1000 -s /bin/bash www-data
ARG PHP_UPSTREAM_CONTAINER=php-fpm ARG PHP_UPSTREAM_CONTAINER=php-fpm
ARG PHP_UPSTREAM_PORT=9000 ARG PHP_UPSTREAM_PORT=9000

3
travis-build.sh
View File

@ -30,6 +30,9 @@ if [ -n "${PHP_VERSION}" ]; then
# memcached extension does not yet support PHP 7.3. # memcached extension does not yet support PHP 7.3.
sed -i -- 's/PHP_FPM_INSTALL_MEMCACHED=true/PHP_FPM_INSTALL_MEMCACHED=false/g' .env sed -i -- 's/PHP_FPM_INSTALL_MEMCACHED=true/PHP_FPM_INSTALL_MEMCACHED=false/g' .env
fi fi
sed -i -- 's/CHANGE_SOURCE=true/CHANGE_SOURCE=false/g' .env
cat .env cat .env
docker-compose build ${BUILD_SERVICE} docker-compose build ${BUILD_SERVICE}
docker images docker images