From 5a0c9054571ba69a6b5ba3cc777234295a6133ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9F=E5=8B=87?= <my242551325@gmail.com>
Date: Thu, 5 Dec 2019 11:23:51 +0800
Subject: [PATCH] feat: change source

---
 docker-compose.yml            |  3 ---
 php-fpm/xdebug.ini            |  2 +-
 workspace/Dockerfile          |  7 ++++---
 workspace/ubuntu.sources.list | 15 ---------------
 4 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 workspace/ubuntu.sources.list

diff --git a/docker-compose.yml b/docker-compose.yml
index acbe2264..d5de70b8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -216,7 +216,6 @@ services:
         - "9000"
       extra_hosts:
         - "dockerhost:${DOCKER_HOST_IP}"
-      dns: 114.114.114.114
       environment:
         - PHP_IDE_CONFIG=${PHP_IDE_CONFIG}
         - DOCKER_HOST=tcp://docker-in-docker:2375
@@ -228,7 +227,6 @@ services:
       links:
         - docker-in-docker
 
-
 ### PHP Worker ############################################
     php-worker:
       build:
@@ -379,7 +377,6 @@ services:
         context: ./mysql
         args:
           - MYSQL_VERSION=${MYSQL_VERSION}
-      command: "--innodb_use_native_aio=0"
       environment:
         - MYSQL_DATABASE=${MYSQL_DATABASE}
         - MYSQL_USER=${MYSQL_USER}
diff --git a/php-fpm/xdebug.ini b/php-fpm/xdebug.ini
index 9bc6578f..8560f98b 100644
--- a/php-fpm/xdebug.ini
+++ b/php-fpm/xdebug.ini
@@ -6,7 +6,7 @@ xdebug.remote_port=9000
 xdebug.idekey=PHPSTORM
 
 xdebug.remote_autostart=0
-xdebug.remote_enable=1
+xdebug.remote_enable=0
 xdebug.cli_color=1
 xdebug.profiler_enable=0
 xdebug.profiler_output_dir="~/xdebug/phpstorm/tmp/profiling"
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 70b5ab40..18eb306a 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -25,11 +25,12 @@ ENV DEBIAN_FRONTEND noninteractive
 
 # If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env.
 
-ADD ubuntu.sources.list /etc/apt/ubuntu.sources.list
 ARG CHANGE_SOURCE=false
 RUN if [ ${CHANGE_SOURCE} = true ]; then \
-  mv /etc/apt/sources.list /etc/apt/sources.list.back && \
-  mv /etc/apt/ubuntu.sources.list /etc/apt/sources.list \
+    # Change application source from deb.debian.org to aliyun source
+    sed -i 's/deb.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list && \
+    sed -i 's/security.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list && \
+    sed -i 's/security-cdn.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list \
 ;fi
 
 # Start as root
diff --git a/workspace/ubuntu.sources.list b/workspace/ubuntu.sources.list
deleted file mode 100644
index 6edaa130..00000000
--- a/workspace/ubuntu.sources.list
+++ /dev/null
@@ -1,15 +0,0 @@
-deb http://mirrors.aliyun.com/ubuntu/ xenial main
-deb-src http://mirrors.aliyun.com/ubuntu/ xenial main
-
-deb http://mirrors.aliyun.com/ubuntu/ xenial-updates main
-deb-src http://mirrors.aliyun.com/ubuntu/ xenial-updates main
-
-deb http://mirrors.aliyun.com/ubuntu/ xenial universe
-deb-src http://mirrors.aliyun.com/ubuntu/ xenial universe
-deb http://mirrors.aliyun.com/ubuntu/ xenial-updates universe
-deb-src http://mirrors.aliyun.com/ubuntu/ xenial-updates universe
-
-deb http://mirrors.aliyun.com/ubuntu/ xenial-security main
-deb-src http://mirrors.aliyun.com/ubuntu/ xenial-security main
-deb http://mirrors.aliyun.com/ubuntu/ xenial-security universe
-deb-src http://mirrors.aliyun.com/ubuntu/ xenial-security universe
\ No newline at end of file