From 025a33906251135b95831ff6854ffa076f8baa6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=9C=97=E7=89=9B?= Date: Wed, 15 Feb 2017 10:20:18 +0800 Subject: [PATCH 1/2] change application source #397 # fix a problem--#397, change application source from dl-cdn.alpinelinux.org to aliyun source. --- nginx/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 1a1db96f..e23be3d5 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -6,6 +6,9 @@ ADD nginx.conf /etc/nginx/ ARG PHP_UPSTREAM=php-fpm +# fix a problem--#397, change application source from dl-cdn.alpinelinux.org to aliyun source. +RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories + RUN apk update \ && apk upgrade \ && apk add --no-cache bash \ From a99281cda844eb8a3a9d00ff4b8dd00406c22f85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=89=9F=E5=8B=87?= Date: Tue, 14 Nov 2017 21:01:07 +0800 Subject: [PATCH 2/2] Change application source from dl-cdn.alpinelinux.org to aliyun source --- env-example | 5 +++++ nginx/Dockerfile | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/env-example b/env-example index 9c401912..e69c33ed 100644 --- a/env-example +++ b/env-example @@ -2,6 +2,11 @@ # General Setup ########################################################### +### Environment ######################################################################################################## +# If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env. + +CHANGE_SOURCE=false + ### Application Path ################################################################################################### # Point to your code, will be available at `/var/www`. diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 77f4abdd..7fe29820 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -4,17 +4,22 @@ MAINTAINER Mahmoud Zalt ADD nginx.conf /etc/nginx/ -ARG PHP_UPSTREAM_CONTAINER=php-fpm -ARG PHP_UPSTREAM_PORT=9000 +# If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env. -# fix a problem--#397, change application source from dl-cdn.alpinelinux.org to aliyun source. -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories +ARG CHANGE_SOURCE=false +RUN if [ ${CHANGE_SOURCE} = true ]; then \ + # Change application source from dl-cdn.alpinelinux.org to aliyun source + RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories +;fi RUN apk update \ && apk upgrade \ && apk add --no-cache bash \ && adduser -D -H -u 1000 -s /bin/bash www-data +ARG PHP_UPSTREAM_CONTAINER=php-fpm +ARG PHP_UPSTREAM_PORT=9000 + # Set upstream conf and remove the default conf RUN echo "upstream php-upstream { server ${PHP_UPSTREAM_CONTAINER}:${PHP_UPSTREAM_PORT}; }" > /etc/nginx/conf.d/upstream.conf \ && rm /etc/nginx/conf.d/default.conf