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

feat: change source

This commit is contained in:
牟勇 2019-12-05 11:23:51 +08:00
parent b6204e5933
commit 5a0c905457
4 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker-compose.yml
View File

@ -216,7 +216,6 @@ services:
- "9000" - "9000"
extra_hosts: extra_hosts:
- "dockerhost:${DOCKER_HOST_IP}" - "dockerhost:${DOCKER_HOST_IP}"
dns: 114.114.114.114
environment: environment:
- PHP_IDE_CONFIG=${PHP_IDE_CONFIG} - PHP_IDE_CONFIG=${PHP_IDE_CONFIG}
- DOCKER_HOST=tcp://docker-in-docker:2375 - DOCKER_HOST=tcp://docker-in-docker:2375
@ -228,7 +227,6 @@ services:
links: links:
- docker-in-docker - docker-in-docker
### PHP Worker ############################################ ### PHP Worker ############################################
php-worker: php-worker:
build: build:
@ -379,7 +377,6 @@ services:
context: ./mysql context: ./mysql
args: args:
- MYSQL_VERSION=${MYSQL_VERSION} - MYSQL_VERSION=${MYSQL_VERSION}
command: "--innodb_use_native_aio=0"
environment: environment:
- MYSQL_DATABASE=${MYSQL_DATABASE} - MYSQL_DATABASE=${MYSQL_DATABASE}
- MYSQL_USER=${MYSQL_USER} - MYSQL_USER=${MYSQL_USER}

2
php-fpm/xdebug.ini
View File

@ -6,7 +6,7 @@ xdebug.remote_port=9000
xdebug.idekey=PHPSTORM xdebug.idekey=PHPSTORM
xdebug.remote_autostart=0 xdebug.remote_autostart=0
xdebug.remote_enable=1 xdebug.remote_enable=0
xdebug.cli_color=1 xdebug.cli_color=1
xdebug.profiler_enable=0 xdebug.profiler_enable=0
xdebug.profiler_output_dir="~/xdebug/phpstorm/tmp/profiling" xdebug.profiler_output_dir="~/xdebug/phpstorm/tmp/profiling"

7
workspace/Dockerfile
View File

@ -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. # 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 ARG CHANGE_SOURCE=false
RUN if [ ${CHANGE_SOURCE} = true ]; then \ RUN if [ ${CHANGE_SOURCE} = true ]; then \
mv /etc/apt/sources.list /etc/apt/sources.list.back && \ # Change application source from deb.debian.org to aliyun source
mv /etc/apt/ubuntu.sources.list /etc/apt/sources.list \ 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 ;fi
# Start as root # Start as root

15
workspace/ubuntu.sources.list
View File

@ -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