From f6fa635873de93900460a10b87676ae384005d6b Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Tue, 19 Jan 2021 21:03:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3composer=E6=97=A0=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.sh     | 13 ++++++-------
 php/Dockerfile |  3 ++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/install.sh b/install.sh
index 288ea77..3543e63 100644
--- a/install.sh
+++ b/install.sh
@@ -31,18 +31,17 @@ REDIS_PASSWORD=1qaz2wsx3edc
 #安装git和curl
 sudo apt-get update && apt-get install -y curl git
 
-if [ ! -d '/etc/docker' ]; then
-  mkdir -p "/etc/docker"
-fi
-
-#写入docker配置
-sudo echo '{"registry-mirrors": ["https://mirror.ccs.tencentyun.com"]}' | tee /etc/docker/daemon.json
-
 #安装docker
 if [ -z "$(command -v docker)" ]; then
   sudo curl -sSL https://get.daocloud.io/docker | sh
 fi
 
+#写入docker配置
+if [ ! -d '/etc/docker' ]; then
+  mkdir -p "/etc/docker"
+  sudo echo '{"registry-mirrors": ["https://mirror.ccs.tencentyun.com"]}' | tee /etc/docker/daemon.json
+fi
+
 #启动docker
 sudo service docker start
 
diff --git a/php/Dockerfile b/php/Dockerfile
index c122117..5821eb8 100644
--- a/php/Dockerfile
+++ b/php/Dockerfile
@@ -30,7 +30,8 @@ RUN docker-php-ext-install pdo_mysql pcntl mbstring bcmath gd \
     && pecl install igbinary redis \
     && docker-php-ext-enable igbinary redis
 
-RUN curl https://mirrors.aliyun.com/composer/composer.phar -o /usr/local/bin/composer
+RUN curl https://mirrors.aliyun.com/composer/composer.phar -o /usr/local/bin/composer \
+    && chmod +x /usr/local/bin/composer
 
 COPY ./cron.d/course /etc/cron.d/course
 
-- 
Gitee