From 9b328cce1f4f0e95e61189658700376fe6ab89a0 Mon Sep 17 00:00:00 2001 From: Mariano D'Agostino Date: Mon, 26 Feb 2018 09:52:50 -0300 Subject: [PATCH 01/18] Make possible to log in via ssh using the laradock user --- workspace/Dockerfile-56 | 1 + workspace/Dockerfile-70 | 1 + workspace/Dockerfile-71 | 3 ++- workspace/Dockerfile-72 | 4 +++- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index 4bd0e63c..8e34fe9d 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -55,6 +55,7 @@ ENV PGID ${PGID} RUN groupadd -g ${PGID} laradock && \ useradd -u ${PUID} -g laradock -m laradock && \ + usermod -p "*" laradock && \ apt-get update -yqq ##################################### diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 2bdc600c..1a6f8777 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -55,6 +55,7 @@ ENV PGID ${PGID} RUN groupadd -g ${PGID} laradock && \ useradd -u ${PUID} -g laradock -m laradock && \ + usermod -p "*" laradock && \ apt-get update -yqq ##################################### diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index 246b3d59..acd39bef 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -54,7 +54,8 @@ ENV PUID ${PUID} ENV PGID ${PGID} RUN groupadd -g ${PGID} laradock && \ - useradd -u ${PUID} -g laradock -m laradock + useradd -u ${PUID} -g laradock -m laradock && \ + usermod -p "*" laradock ##################################### # SOAP: diff --git a/workspace/Dockerfile-72 b/workspace/Dockerfile-72 index 1099373e..8252de37 100644 --- a/workspace/Dockerfile-72 +++ b/workspace/Dockerfile-72 @@ -54,7 +54,9 @@ ENV PUID ${PUID} ENV PGID ${PGID} RUN groupadd -g ${PGID} laradock && \ - useradd -u ${PUID} -g laradock -m laradock + useradd -u ${PUID} -g laradock -m laradock && \ + usermod -p "*" laradock + ##################################### # SOAP: From cbd0f1de79105f1ed9aba86a750b2eda55c2f9bc Mon Sep 17 00:00:00 2001 From: Mariano D'Agostino Date: Mon, 26 Feb 2018 10:25:15 -0300 Subject: [PATCH 02/18] Update documentation to explain how to login via ssh using the laradock user --- DOCUMENTATION/content/documentation/index.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index a0693860..a78d982b 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -1092,7 +1092,18 @@ To change the default forwarded port for ssh: ... ``` +Then login using: +```bash +ssh -o PasswordAuthentication=no \ + -o StrictHostKeyChecking=no \ + -o UserKnownHostsFile=/dev/null \ + -p 2222 \ + -i workspace/insecure_id_rsa \ + laradock@localhost +``` + +To login as root, replace laradock@locahost with root@localhost.
From 00e43655bd9b487e2783d072dd46f5e518797f40 Mon Sep 17 00:00:00 2001 From: Taufek Johar Date: Sun, 25 Feb 2018 17:21:53 +0800 Subject: [PATCH 03/18] Use Volume Cached Flag for Application Path Volume Use cached flag to speed up file sync performance. References: https://docs.docker.com/docker-for-mac/osxfs-caching/#tuning-with-consistent-cached-and-delegated-configurations https://blog.docker.com/2017/05/user-guided-caching-in-docker-for-mac/ --- docker-compose.dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index ed1e80fb..45567e16 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -6,4 +6,4 @@ services: applications: volumes: - - ${APPLICATION}:/var/www + - ${APPLICATION}:/var/www:cached From 23b8239cfaf0b382c8600497d2dc960a7fa5655d Mon Sep 17 00:00:00 2001 From: Spyros Sakellaropoulos Date: Fri, 9 Mar 2018 10:47:43 +0200 Subject: [PATCH 04/18] Save PostgresSQL data to hard drive. PostgresSQL data don't get saved to hard drive. This tweak should fix that --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 13175283..61a40eab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -294,7 +294,7 @@ services: postgres: build: ./postgres volumes: - - ${DATA_SAVE_PATH}/postgres:/var/lib/postgresql + - ${DATA_SAVE_PATH}/postgres:/var/lib/postgresql/data ports: - "${POSTGRES_PORT}:5432" environment: From e694254fb04e9bad1c28f7866435cc7a88ffafbd Mon Sep 17 00:00:00 2001 From: mfpang Date: Sun, 18 Mar 2018 17:34:15 +0800 Subject: [PATCH 05/18] WEB_DOCUMENT_ROOT accept argument DOCUMENT_ROOT with original default value /var/www/ --- apache2/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apache2/Dockerfile b/apache2/Dockerfile index d15d0082..71cad501 100644 --- a/apache2/Dockerfile +++ b/apache2/Dockerfile @@ -5,10 +5,11 @@ LABEL maintainer="Eric Pfeiffer " ARG PHP_UPSTREAM_CONTAINER=php-fpm ARG PHP_UPSTREAM_PORT=9000 ARG PHP_UPSTREAM_TIMEOUT=60 +ARG DOCUMENT_ROOT=/var/www/ ENV WEB_PHP_SOCKET=${PHP_UPSTREAM_CONTAINER}:${PHP_UPSTREAM_PORT} -ENV WEB_DOCUMENT_ROOT=/var/www/ +ENV WEB_DOCUMENT_ROOT=${DOCUMENT_ROOT} ENV WEB_PHP_TIMEOUT=${PHP_UPSTREAM_TIMEOUT} From f5f23bed1bdd0bd1547aac8a35e7bc2998c67c2f Mon Sep 17 00:00:00 2001 From: mfpang Date: Sun, 18 Mar 2018 17:37:21 +0800 Subject: [PATCH 06/18] apache2 accept APACHE_DOCUMENT_ROOT argument from .env file --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 13175283..839aef1b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -173,6 +173,7 @@ services: - PHP_UPSTREAM_CONTAINER=${APACHE_PHP_UPSTREAM_CONTAINER} - PHP_UPSTREAM_PORT=${APACHE_PHP_UPSTREAM_PORT} - PHP_UPSTREAM_TIMEOUT=${APACHE_PHP_UPSTREAM_TIMEOUT} + - DOCUMENT_ROOT=${APACHE_DOCUMENT_ROOT} volumes_from: - applications volumes: From f810962d84245cdab47a8f08973db277af09d5b2 Mon Sep 17 00:00:00 2001 From: mfpang Date: Sun, 18 Mar 2018 17:38:49 +0800 Subject: [PATCH 07/18] add APACHE_DOCUMENT_ROOT in env-example file --- env-example | 1 + 1 file changed, 1 insertion(+) diff --git a/env-example b/env-example index 7be68b22..12ed88aa 100644 --- a/env-example +++ b/env-example @@ -147,6 +147,7 @@ APACHE_SITES_PATH=./apache2/sites APACHE_PHP_UPSTREAM_CONTAINER=php-fpm APACHE_PHP_UPSTREAM_PORT=9000 APACHE_PHP_UPSTREAM_TIMEOUT=60 +APACHE_DOCUMENT_ROOT=/var/www/ ### MYSQL ############################################################################################################## From 5773d270cac05022d01c8e8089d4b59fc5f60136 Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Mon, 19 Mar 2018 22:15:24 +0800 Subject: [PATCH 08/18] clean up aerospike and empty line --- php-fpm/Dockerfile-56 | 9 ++++++--- php-fpm/Dockerfile-70 | 7 +++++-- php-fpm/Dockerfile-71 | 9 ++------- php-fpm/Dockerfile-72 | 10 ++-------- workspace/Dockerfile-56 | 25 ++++++++----------------- workspace/Dockerfile-70 | 23 +++++++---------------- workspace/Dockerfile-71 | 19 +++---------------- workspace/Dockerfile-72 | 23 +++++------------------ 8 files changed, 38 insertions(+), 87 deletions(-) diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56 index 93bc0ba8..4fd449a6 100644 --- a/php-fpm/Dockerfile-56 +++ b/php-fpm/Dockerfile-56 @@ -206,14 +206,17 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \ ##################################### # PHP Aerospike: ##################################### +USER root ARG INSTALL_AEROSPIKE=false ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} -# Copy aerospike configration for remote debugging -COPY ./aerospike.ini /usr/local/etc/php/conf.d/aerospike.ini + RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ + # Fix dependencies for PHPUnit within aerospike extension + apt-get update -yqq && \ + apt-get -y install sudo wget && \ # Install the php aerospike extension - curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php5/archive/3.4.15.tar.gz" \ + curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php5/archive/master.tar.gz" \ && mkdir -p aerospike-client-php \ && tar -C aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \ && ( \ diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index f0dfb44e..b1d045e6 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -213,12 +213,15 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \ ##################################### # PHP Aerospike: ##################################### +USER root ARG INSTALL_AEROSPIKE=false ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} -# Copy aerospike configration for remote debugging -COPY ./aerospike.ini /usr/local/etc/php/conf.d/aerospike.ini + RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ + # Fix dependencies for PHPUnit within aerospike extension + apt-get update -yqq && \ + apt-get -y install sudo wget && \ # Install the php aerospike extension curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/master.tar.gz" \ && mkdir -p aerospike-client-php \ diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index 13c6001c..78b7e53c 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -213,13 +213,11 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \ ##################################### # PHP Aerospike: ##################################### +USER root ARG INSTALL_AEROSPIKE=false ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} -# Copy aerospike configration for remote debugging -COPY ./aerospike.ini /usr/local/etc/php/conf.d/aerospike.ini - RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ # Fix dependencies for PHPUnit within aerospike extension apt-get update -yqq && \ @@ -235,10 +233,7 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ && make install \ ) \ && rm /tmp/aerospike-client-php.tar.gz \ -;fi - -RUN if [ ${INSTALL_AEROSPIKE} = false ]; then \ - rm /usr/local/etc/php/conf.d/aerospike.ini \ + && docker-php-ext-enable aerospike \ ;fi ##################################### diff --git a/php-fpm/Dockerfile-72 b/php-fpm/Dockerfile-72 index 0a372a2d..073af76d 100644 --- a/php-fpm/Dockerfile-72 +++ b/php-fpm/Dockerfile-72 @@ -216,18 +216,15 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \ ##################################### # PHP Aerospike: ##################################### +USER root ARG INSTALL_AEROSPIKE=false ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} -# Copy aerospike configration for remote debugging -COPY ./aerospike.ini /usr/local/etc/php/conf.d/aerospike.ini - RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ # Fix dependencies for PHPUnit within aerospike extension apt-get update -yqq && \ apt-get -y install sudo wget && \ - # Install the php aerospike extension (using 7.2.0-in-progress branch until support for 7.2 on master) curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/7.2.0-in-progress.tar.gz" \ && mkdir -p aerospike-client-php \ @@ -239,10 +236,7 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ && make install \ ) \ && rm /tmp/aerospike-client-php.tar.gz \ -;fi - -RUN if [ ${INSTALL_AEROSPIKE} = false ]; then \ - rm /usr/local/etc/php/conf.d/aerospike.ini \ + && docker-php-ext-enable aerospike \ ;fi ##################################### diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index 52d2a001..9dc76b34 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -384,15 +384,15 @@ RUN if [ ${INSTALL_YARN} = true ]; then \ ##################################### USER root -ARG INSTALL_AEROSPIKE=true +ARG INSTALL_AEROSPIKE=false ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} -# Copy aerospike configration for remote debugging -COPY ./aerospike.ini /etc/php/5.6/cli/conf.d/aerospike.ini - RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ + # Fix dependencies for PHPUnit within aerospike extension + apt-get update -yqq && \ + apt-get -y install sudo wget && \ # Install the php aerospike extension - curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php5/archive/3.4.15.tar.gz" \ + curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php5/archive/master.tar.gz" \ && mkdir -p aerospike-client-php \ && tar -C aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \ && ( \ @@ -402,10 +402,9 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ && make install \ ) \ && rm /tmp/aerospike-client-php.tar.gz \ -;fi - -RUN if [ ${INSTALL_AEROSPIKE} = false ]; then \ - rm /etc/php/5.6/cli/conf.d/aerospike.ini \ + && echo 'extension=aerospike.so' >> /etc/php/5.6/cli/conf.d/aerospike.ini \ + && echo 'aerospike.udf.lua_system_path=/usr/local/aerospike/lua' >> /etc/php/5.6/cli/conf.d/aerospike.ini \ + && echo 'aerospike.udf.lua_user_path=/usr/local/aerospike/usr-lua' >> /etc/php/5.6/cli/conf.d/aerospike.ini \ ;fi ##################################### @@ -507,7 +506,6 @@ ARG INSTALL_LINUXBREW=true ENV INSTALL_LINUXBREW ${INSTALL_LINUXBREW} RUN if [ ${INSTALL_LINUXBREW} = true ]; then \ - # Preparation apt-get upgrade -y && \ apt-get install -y build-essential make cmake scons curl git \ @@ -515,13 +513,10 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \ gettext libtool flex bison \ libbz2-dev libcurl4-openssl-dev \ libexpat-dev libncurses-dev && \ - # Install the Linuxbrew git clone --depth=1 https://github.com/Homebrew/linuxbrew.git ~/.linuxbrew && \ - echo "" >> ~/.bashrc && \ echo 'export PKG_CONFIG_PATH"=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc && \ - # Setup linuxbrew echo 'export LINUXBREWHOME="$HOME/.linuxbrew"' >> ~/.bashrc && \ echo 'export PATH="$LINUXBREWHOME/bin:$PATH"' >> ~/.bashrc && \ @@ -577,19 +572,15 @@ USER root ARG INSTALL_SYMFONY=false ENV INSTALL_SYMFONY ${INSTALL_SYMFONY} RUN if [ ${INSTALL_SYMFONY} = true ]; then \ - mkdir -p /usr/local/bin \ && curl -LsS https://symfony.com/installer -o /usr/local/bin/symfony \ && chmod a+x /usr/local/bin/symfony \ - # Symfony 3 alias && echo 'alias dev="php bin/console -e=dev"' >> ~/.bashrc \ && echo 'alias prod="php bin/console -e=prod"' >> ~/.bashrc \ - # Symfony 2 alias # && echo 'alias dev="php app/console -e=dev"' >> ~/.bashrc \ # && echo 'alias prod="php app/console -e=prod"' >> ~/.bashrc \ - ;fi ##################################### diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 384dbbde..f9c5b0ca 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -380,13 +380,13 @@ RUN if [ ${INSTALL_YARN} = true ]; then \ ##################################### USER root -ARG INSTALL_AEROSPIKE=true +ARG INSTALL_AEROSPIKE=false ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} -# Copy aerospike configration for remote debugging -COPY ./aerospike.ini /etc/php/7.0/cli/conf.d/aerospike.ini - RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ + # Fix dependencies for PHPUnit within aerospike extension + apt-get update -yqq && \ + apt-get -y install sudo wget && \ # Install the php aerospike extension curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/master.tar.gz" \ && mkdir -p aerospike-client-php \ @@ -398,10 +398,9 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ && make install \ ) \ && rm /tmp/aerospike-client-php.tar.gz \ -;fi - -RUN if [ ${INSTALL_AEROSPIKE} = false ]; then \ - rm /etc/php/7.0/cli/conf.d/aerospike.ini \ + && echo 'extension=aerospike.so' >> /etc/php/7.0/cli/conf.d/aerospike.ini \ + && echo 'aerospike.udf.lua_system_path=/usr/local/aerospike/lua' >> /etc/php/7.0/cli/conf.d/aerospike.ini \ + && echo 'aerospike.udf.lua_user_path=/usr/local/aerospike/usr-lua' >> /etc/php/7.0/cli/conf.d/aerospike.ini \ ;fi ##################################### @@ -503,7 +502,6 @@ ARG INSTALL_LINUXBREW=true ENV INSTALL_LINUXBREW ${INSTALL_LINUXBREW} RUN if [ ${INSTALL_LINUXBREW} = true ]; then \ - # Preparation apt-get upgrade -y && \ apt-get install -y build-essential make cmake scons curl git \ @@ -511,13 +509,10 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \ gettext libtool flex bison \ libbz2-dev libcurl4-openssl-dev \ libexpat-dev libncurses-dev && \ - # Install the Linuxbrew git clone --depth=1 https://github.com/Homebrew/linuxbrew.git ~/.linuxbrew && \ - echo "" >> ~/.bashrc && \ echo 'export PKG_CONFIG_PATH"=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc && \ - # Setup linuxbrew echo 'export LINUXBREWHOME="$HOME/.linuxbrew"' >> ~/.bashrc && \ echo 'export PATH="$LINUXBREWHOME/bin:$PATH"' >> ~/.bashrc && \ @@ -595,19 +590,15 @@ USER root ARG INSTALL_SYMFONY=false ENV INSTALL_SYMFONY ${INSTALL_SYMFONY} RUN if [ ${INSTALL_SYMFONY} = true ]; then \ - mkdir -p /usr/local/bin \ && curl -LsS https://symfony.com/installer -o /usr/local/bin/symfony \ && chmod a+x /usr/local/bin/symfony \ - # Symfony 3 alias && echo 'alias dev="php bin/console -e=dev"' >> ~/.bashrc \ && echo 'alias prod="php bin/console -e=prod"' >> ~/.bashrc \ - # Symfony 2 alias # && echo 'alias dev="php app/console -e=dev"' >> ~/.bashrc \ # && echo 'alias prod="php app/console -e=prod"' >> ~/.bashrc \ - ;fi ##################################### diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index b5521c7f..4ae3cfe9 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -379,14 +379,10 @@ USER root ARG INSTALL_AEROSPIKE=false ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} -# Copy aerospike configration for remote debugging -COPY ./aerospike.ini /etc/php/7.1/cli/conf.d/aerospike.ini - RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ # Fix dependencies for PHPUnit within aerospike extension apt-get update -yqq && \ apt-get -y install sudo wget && \ - # Install the php aerospike extension curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/master.tar.gz" \ && mkdir -p aerospike-client-php \ @@ -398,10 +394,9 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ && make install \ ) \ && rm /tmp/aerospike-client-php.tar.gz \ -;fi - -RUN if [ ${INSTALL_AEROSPIKE} = false ]; then \ - rm /etc/php/7.1/cli/conf.d/aerospike.ini \ + && echo 'extension=aerospike.so' >> /etc/php/7.1/cli/conf.d/aerospike.ini \ + && echo 'aerospike.udf.lua_system_path=/usr/local/aerospike/lua' >> /etc/php/7.1/cli/conf.d/aerospike.ini \ + && echo 'aerospike.udf.lua_user_path=/usr/local/aerospike/usr-lua' >> /etc/php/7.1/cli/conf.d/aerospike.ini \ ;fi ##################################### @@ -512,7 +507,6 @@ ARG INSTALL_LINUXBREW=false ENV INSTALL_LINUXBREW ${INSTALL_LINUXBREW} RUN if [ ${INSTALL_LINUXBREW} = true ]; then \ - # Preparation apt-get upgrade -y && \ apt-get install -y build-essential make cmake scons curl git \ @@ -520,13 +514,10 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \ gettext libtool flex bison \ libbz2-dev libcurl4-openssl-dev \ libexpat-dev libncurses-dev && \ - # Install the Linuxbrew git clone --depth=1 https://github.com/Homebrew/linuxbrew.git ~/.linuxbrew && \ - echo "" >> ~/.bashrc && \ echo 'export PKG_CONFIG_PATH"=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc && \ - # Setup linuxbrew echo 'export LINUXBREWHOME="$HOME/.linuxbrew"' >> ~/.bashrc && \ echo 'export PATH="$LINUXBREWHOME/bin:$PATH"' >> ~/.bashrc && \ @@ -606,19 +597,15 @@ USER root ARG INSTALL_SYMFONY=false ENV INSTALL_SYMFONY ${INSTALL_SYMFONY} RUN if [ ${INSTALL_SYMFONY} = true ]; then \ - mkdir -p /usr/local/bin \ && curl -LsS https://symfony.com/installer -o /usr/local/bin/symfony \ && chmod a+x /usr/local/bin/symfony \ - # Symfony 3 alias && echo 'alias dev="php bin/console -e=dev"' >> ~/.bashrc \ && echo 'alias prod="php bin/console -e=prod"' >> ~/.bashrc \ - # Symfony 2 alias # && echo 'alias dev="php app/console -e=dev"' >> ~/.bashrc \ # && echo 'alias prod="php app/console -e=prod"' >> ~/.bashrc \ - ;fi ##################################### diff --git a/workspace/Dockerfile-72 b/workspace/Dockerfile-72 index 3a042ee8..7852a1b3 100644 --- a/workspace/Dockerfile-72 +++ b/workspace/Dockerfile-72 @@ -379,16 +379,12 @@ USER root ARG INSTALL_AEROSPIKE=false ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} -# Copy aerospike configration for remote debugging -COPY ./aerospike.ini /etc/php/7.2/cli/conf.d/aerospike.ini - RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ # Fix dependencies for PHPUnit within aerospike extension apt-get update -yqq && \ apt-get -y install sudo wget && \ - - # Install the php aerospike extension - curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/master.tar.gz" \ + # Install the php aerospike extension (using 7.2.0-in-progress branch until support for 7.2 on master) + curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/7.2.0-in-progress.tar.gz" \ && mkdir -p aerospike-client-php \ && tar -C aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \ && ( \ @@ -398,10 +394,9 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ && make install \ ) \ && rm /tmp/aerospike-client-php.tar.gz \ -;fi - -RUN if [ ${INSTALL_AEROSPIKE} = false ]; then \ - rm /etc/php/7.2/cli/conf.d/aerospike.ini \ + && echo 'extension=aerospike.so' >> /etc/php/7.2/cli/conf.d/aerospike.ini \ + && echo 'aerospike.udf.lua_system_path=/usr/local/aerospike/lua' >> /etc/php/7.2/cli/conf.d/aerospike.ini \ + && echo 'aerospike.udf.lua_user_path=/usr/local/aerospike/usr-lua' >> /etc/php/7.2/cli/conf.d/aerospike.ini \ ;fi ##################################### @@ -507,7 +502,6 @@ ARG INSTALL_LINUXBREW=false ENV INSTALL_LINUXBREW ${INSTALL_LINUXBREW} RUN if [ ${INSTALL_LINUXBREW} = true ]; then \ - # Preparation apt-get upgrade -y && \ apt-get install -y build-essential make cmake scons curl git \ @@ -515,13 +509,10 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \ gettext libtool flex bison \ libbz2-dev libcurl4-openssl-dev \ libexpat-dev libncurses-dev && \ - # Install the Linuxbrew git clone --depth=1 https://github.com/Homebrew/linuxbrew.git ~/.linuxbrew && \ - echo "" >> ~/.bashrc && \ echo 'export PKG_CONFIG_PATH"=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc && \ - # Setup linuxbrew echo 'export LINUXBREWHOME="$HOME/.linuxbrew"' >> ~/.bashrc && \ echo 'export PATH="$LINUXBREWHOME/bin:$PATH"' >> ~/.bashrc && \ @@ -601,19 +592,15 @@ USER root ARG INSTALL_SYMFONY=false ENV INSTALL_SYMFONY ${INSTALL_SYMFONY} RUN if [ ${INSTALL_SYMFONY} = true ]; then \ - mkdir -p /usr/local/bin \ && curl -LsS https://symfony.com/installer -o /usr/local/bin/symfony \ && chmod a+x /usr/local/bin/symfony \ - # Symfony 3 alias && echo 'alias dev="php bin/console -e=dev"' >> ~/.bashrc \ && echo 'alias prod="php bin/console -e=prod"' >> ~/.bashrc \ - # Symfony 2 alias # && echo 'alias dev="php app/console -e=dev"' >> ~/.bashrc \ # && echo 'alias prod="php app/console -e=prod"' >> ~/.bashrc \ - ;fi ##################################### From 99c7758799b7dd02fc5558dba713b3f227602d86 Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Tue, 20 Mar 2018 10:59:59 +0800 Subject: [PATCH 09/18] update default install arg and remove extra run command --- workspace/Dockerfile-56 | 4 ++-- workspace/Dockerfile-70 | 4 ++-- workspace/Dockerfile-71 | 5 ----- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index 9dc76b34..141b05c3 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -439,7 +439,7 @@ RUN echo "" >> ~/.bashrc && \ ##################################### USER laradock -ARG INSTALL_LARAVEL_ENVOY=true +ARG INSTALL_LARAVEL_ENVOY=false ENV INSTALL_LARAVEL_ENVOY ${INSTALL_LARAVEL_ENVOY} RUN if [ ${INSTALL_LARAVEL_ENVOY} = true ]; then \ @@ -459,7 +459,7 @@ RUN if [ ${COMPOSER_REPO_PACKAGIST} ]; then \ composer config -g repo.packagist composer ${COMPOSER_REPO_PACKAGIST} \ ;fi -ARG INSTALL_LARAVEL_INSTALLER=true +ARG INSTALL_LARAVEL_INSTALLER=false ENV INSTALL_LARAVEL_INSTALLER ${INSTALL_LARAVEL_INSTALLER} RUN if [ ${INSTALL_LARAVEL_INSTALLER} = true ]; then \ diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index f9c5b0ca..2eb8d91d 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -435,7 +435,7 @@ RUN echo "" >> ~/.bashrc && \ ##################################### USER laradock -ARG INSTALL_LARAVEL_ENVOY=true +ARG INSTALL_LARAVEL_ENVOY=false ENV INSTALL_LARAVEL_ENVOY ${INSTALL_LARAVEL_ENVOY} RUN if [ ${INSTALL_LARAVEL_ENVOY} = true ]; then \ @@ -455,7 +455,7 @@ RUN if [ ${COMPOSER_REPO_PACKAGIST} ]; then \ composer config -g repo.packagist composer ${COMPOSER_REPO_PACKAGIST} \ ;fi -ARG INSTALL_LARAVEL_INSTALLER=true +ARG INSTALL_LARAVEL_INSTALLER=false ENV INSTALL_LARAVEL_INSTALLER ${INSTALL_LARAVEL_INSTALLER} RUN if [ ${INSTALL_LARAVEL_INSTALLER} = true ]; then \ diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index 4ae3cfe9..67afae58 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -429,11 +429,6 @@ RUN echo "" >> ~/.bashrc && \ ##################################### # Laravel Envoy: ##################################### -USER root - -RUN apt-get update -yqq \ - && apt-get install -y php-curl - USER laradock ARG INSTALL_LARAVEL_ENVOY=false From 4d384c0a67acd732ab60aa856cbd41032d0e4c2e Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Fri, 23 Mar 2018 15:17:35 +0800 Subject: [PATCH 10/18] fix mistake #1427 about user aliases. --- workspace/Dockerfile-56 | 18 +++++++++++++----- workspace/Dockerfile-70 | 18 +++++++++++++----- workspace/Dockerfile-71 | 18 +++++++++++++----- workspace/Dockerfile-72 | 18 +++++++++++++----- 4 files changed, 52 insertions(+), 20 deletions(-) diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index 141b05c3..964ecb87 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -151,14 +151,22 @@ RUN chmod -R 644 /etc/cron.d ##################################### USER root +COPY ./aliases.sh /root/aliases.sh COPY ./aliases.sh /home/laradock/aliases.sh + +RUN sed -i 's/\r//' /root/aliases.sh && \ + sed -i 's/\r//' /home/laradock/aliases.sh && \ + echo "" >> ~/.bashrc && \ + echo "# Load Custom Aliases" >> ~/.bashrc && \ + echo "source ~/aliases.sh" >> ~/.bashrc && \ + echo "" >> ~/.bashrc + +USER laradock + RUN echo "" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \ - echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \ - echo "" >> ~/.bashrc && \ - sed -i 's/\r//' /home/laradock/aliases.sh && \ - sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh && \ - chown laradock:laradock /home/laradock/aliases.sh + echo "source ~/aliases.sh" >> ~/.bashrc && \ + echo "" >> ~/.bashrc ##################################### # xDebug: diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 2eb8d91d..2d7194c0 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -148,14 +148,22 @@ RUN chmod -R 644 /etc/cron.d ##################################### USER root +COPY ./aliases.sh /root/aliases.sh COPY ./aliases.sh /home/laradock/aliases.sh + +RUN sed -i 's/\r//' /root/aliases.sh && \ + sed -i 's/\r//' /home/laradock/aliases.sh && \ + echo "" >> ~/.bashrc && \ + echo "# Load Custom Aliases" >> ~/.bashrc && \ + echo "source ~/aliases.sh" >> ~/.bashrc && \ + echo "" >> ~/.bashrc + +USER laradock + RUN echo "" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \ - echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \ - echo "" >> ~/.bashrc && \ - sed -i 's/\r//' /home/laradock/aliases.sh && \ - sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh && \ - chown laradock:laradock /home/laradock/aliases.sh + echo "source ~/aliases.sh" >> ~/.bashrc && \ + echo "" >> ~/.bashrc ##################################### # xDebug: diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index 67afae58..80a73d5e 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -143,14 +143,22 @@ RUN chmod -R 644 /etc/cron.d ##################################### USER root +COPY ./aliases.sh /root/aliases.sh COPY ./aliases.sh /home/laradock/aliases.sh + +RUN sed -i 's/\r//' /root/aliases.sh && \ + sed -i 's/\r//' /home/laradock/aliases.sh && \ + echo "" >> ~/.bashrc && \ + echo "# Load Custom Aliases" >> ~/.bashrc && \ + echo "source ~/aliases.sh" >> ~/.bashrc && \ + echo "" >> ~/.bashrc + +USER laradock + RUN echo "" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \ - echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \ - echo "" >> ~/.bashrc && \ - sed -i 's/\r//' /home/laradock/aliases.sh && \ - sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh && \ - chown laradock:laradock /home/laradock/aliases.sh + echo "source ~/aliases.sh" >> ~/.bashrc && \ + echo "" >> ~/.bashrc ##################################### # xDebug: diff --git a/workspace/Dockerfile-72 b/workspace/Dockerfile-72 index 7852a1b3..ad025cac 100644 --- a/workspace/Dockerfile-72 +++ b/workspace/Dockerfile-72 @@ -143,14 +143,22 @@ RUN chmod -R 644 /etc/cron.d ##################################### USER root +COPY ./aliases.sh /root/aliases.sh COPY ./aliases.sh /home/laradock/aliases.sh + +RUN sed -i 's/\r//' /root/aliases.sh && \ + sed -i 's/\r//' /home/laradock/aliases.sh && \ + echo "" >> ~/.bashrc && \ + echo "# Load Custom Aliases" >> ~/.bashrc && \ + echo "source ~/aliases.sh" >> ~/.bashrc && \ + echo "" >> ~/.bashrc + +USER laradock + RUN echo "" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \ - echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \ - echo "" >> ~/.bashrc && \ - sed -i 's/\r//' /home/laradock/aliases.sh && \ - sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh && \ - chown laradock:laradock /home/laradock/aliases.sh + echo "source ~/aliases.sh" >> ~/.bashrc && \ + echo "" >> ~/.bashrc ##################################### # xDebug: From 141d2dbe7fb035b6aa4333709d1c9312ebae1070 Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Fri, 23 Mar 2018 16:09:10 +0800 Subject: [PATCH 11/18] fix file owner. --- workspace/Dockerfile-56 | 1 + workspace/Dockerfile-70 | 1 + workspace/Dockerfile-71 | 1 + workspace/Dockerfile-72 | 1 + 4 files changed, 4 insertions(+) diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index 964ecb87..b5756a58 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -156,6 +156,7 @@ COPY ./aliases.sh /home/laradock/aliases.sh RUN sed -i 's/\r//' /root/aliases.sh && \ sed -i 's/\r//' /home/laradock/aliases.sh && \ + chown laradock:laradock /home/laradock/aliases.sh && \ echo "" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \ echo "source ~/aliases.sh" >> ~/.bashrc && \ diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 2d7194c0..340afeff 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -153,6 +153,7 @@ COPY ./aliases.sh /home/laradock/aliases.sh RUN sed -i 's/\r//' /root/aliases.sh && \ sed -i 's/\r//' /home/laradock/aliases.sh && \ + chown laradock:laradock /home/laradock/aliases.sh && \ echo "" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \ echo "source ~/aliases.sh" >> ~/.bashrc && \ diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index 80a73d5e..e7f80cfb 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -148,6 +148,7 @@ COPY ./aliases.sh /home/laradock/aliases.sh RUN sed -i 's/\r//' /root/aliases.sh && \ sed -i 's/\r//' /home/laradock/aliases.sh && \ + chown laradock:laradock /home/laradock/aliases.sh && \ echo "" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \ echo "source ~/aliases.sh" >> ~/.bashrc && \ diff --git a/workspace/Dockerfile-72 b/workspace/Dockerfile-72 index ad025cac..f2b1cc5c 100644 --- a/workspace/Dockerfile-72 +++ b/workspace/Dockerfile-72 @@ -148,6 +148,7 @@ COPY ./aliases.sh /home/laradock/aliases.sh RUN sed -i 's/\r//' /root/aliases.sh && \ sed -i 's/\r//' /home/laradock/aliases.sh && \ + chown laradock:laradock /home/laradock/aliases.sh && \ echo "" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \ echo "source ~/aliases.sh" >> ~/.bashrc && \ From cd849dda219ad1f237c25281036fd337621b0fbb Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Sat, 24 Mar 2018 13:56:06 +0800 Subject: [PATCH 12/18] php-fpm sql server section: increase install check --- php-fpm/Dockerfile-56 | 10 +++++----- php-fpm/Dockerfile-70 | 23 ++++++++++++----------- php-fpm/Dockerfile-71 | 23 +++++++++++++---------- php-fpm/Dockerfile-72 | 25 +++++++++++++------------ 4 files changed, 43 insertions(+), 38 deletions(-) diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56 index 4fd449a6..3290ff10 100644 --- a/php-fpm/Dockerfile-56 +++ b/php-fpm/Dockerfile-56 @@ -302,11 +302,11 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \ ##################################### ARG INSTALL_MSSQL=false ENV INSTALL_MSSQL ${INSTALL_MSSQL} - -RUN if [ ${INSTALL_MSSQL} = true ]; then \ - apt-get -y install php5-sybase freetds-bin && \ - cp /usr/lib/php5/20131226/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20131226/ && \ - docker-php-ext-enable mssql pdo pdo_dblib \ +RUN set -eux; if [ ${INSTALL_MSSQL} = true ]; then \ + apt-get -y install php5-sybase freetds-bin \ + && cp /usr/lib/php5/20131226/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20131226/ \ + && docker-php-ext-enable pdo_dblib mssql \ + && php -m | grep -q 'mssql' \ ;fi ##################################### diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index b1d045e6..281a64f0 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -308,26 +308,27 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \ ##################################### # SQL SERVER: ##################################### - ARG INSTALL_MSSQL=false ENV INSTALL_MSSQL ${INSTALL_MSSQL} -RUN if [ ${INSTALL_MSSQL} = true ]; then \ +RUN set -eux; if [ ${INSTALL_MSSQL} = true ]; then \ ##################################### # Ref from https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-adding-pdo_sqlsrv-and-sqlsrv-to-official-php-image ##################################### # Add Microsoft repo for Microsoft ODBC Driver 13 for Linux apt-get update -yqq \ - && apt-get install -y apt-transport-https \ - && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ - && curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \ - && apt-get update -yqq \ + && apt-get install -y apt-transport-https \ + && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ + && curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \ + && apt-get update -yqq \ # Install Dependencies - && ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \ - && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ - && locale-gen \ + && ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \ + && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ + && locale-gen \ # Install pdo_sqlsrv and sqlsrv from PECL. Replace pdo_sqlsrv-4.1.8preview with preferred version. - && pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \ - && docker-php-ext-enable pdo_sqlsrv sqlsrv \ + && pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \ + && docker-php-ext-enable pdo_sqlsrv sqlsrv \ + && php -m | grep -q 'pdo_sqlsrv' \ + && php -m | grep -q 'sqlsrv' \ ;fi ##################################### diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index 78b7e53c..d87584cf 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -308,24 +308,27 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \ ##################################### # SQL SERVER: ##################################### - ARG INSTALL_MSSQL=false ENV INSTALL_MSSQL ${INSTALL_MSSQL} -RUN if [ ${INSTALL_MSSQL} = true ]; then \ +RUN set -eux; if [ ${INSTALL_MSSQL} = true ]; then \ ##################################### # Ref from https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-adding-pdo_sqlsrv-and-sqlsrv-to-official-php-image ##################################### # Add Microsoft repo for Microsoft ODBC Driver 13 for Linux - apt-get update -yqq && apt-get install -y apt-transport-https \ - && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ - && curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \ - && apt-get update -yqq \ + apt-get update -yqq \ + && apt-get install -y apt-transport-https \ + && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ + && curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \ + && apt-get update -yqq \ # Install Dependencies - && ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \ - && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen \ + && ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \ + && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ + && locale-gen \ # Install pdo_sqlsrv and sqlsrv from PECL. Replace pdo_sqlsrv-4.1.8preview with preferred version. - && pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \ - && docker-php-ext-enable pdo_sqlsrv sqlsrv \ + && pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \ + && docker-php-ext-enable pdo_sqlsrv sqlsrv \ + && php -m | grep -q 'pdo_sqlsrv' \ + && php -m | grep -q 'sqlsrv' \ ;fi ##################################### diff --git a/php-fpm/Dockerfile-72 b/php-fpm/Dockerfile-72 index 073af76d..c9ea138c 100644 --- a/php-fpm/Dockerfile-72 +++ b/php-fpm/Dockerfile-72 @@ -311,26 +311,27 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \ ##################################### # SQL SERVER: ##################################### - ARG INSTALL_MSSQL=false ENV INSTALL_MSSQL ${INSTALL_MSSQL} -RUN if [ ${INSTALL_MSSQL} = true ]; then \ +RUN set -eux; if [ ${INSTALL_MSSQL} = true ]; then \ ##################################### # Ref from https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-adding-pdo_sqlsrv-and-sqlsrv-to-official-php-image ##################################### # Add Microsoft repo for Microsoft ODBC Driver 13 for Linux - apt-get update -yqq && apt-get install -y apt-transport-https gnupg \ - && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ - && curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \ - && apt-get update -yqq \ - + apt-get update -yqq \ + && apt-get install -y apt-transport-https gnupg \ + && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ + && curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \ + && apt-get update -yqq \ # Install Dependencies - && ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \ - && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen \ - + && ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \ + && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ + && locale-gen \ # Install pdo_sqlsrv and sqlsrv from PECL. Replace pdo_sqlsrv-4.1.8preview with preferred version. - && pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \ - && docker-php-ext-enable pdo_sqlsrv sqlsrv \ + && pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \ + && docker-php-ext-enable pdo_sqlsrv sqlsrv \ + && php -m | grep -q 'pdo_sqlsrv' \ + && php -m | grep -q 'sqlsrv' \ ;fi ##################################### From e6817288f820aa11e485a46a862ab7b16dc4303e Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Sat, 24 Mar 2018 14:23:01 +0800 Subject: [PATCH 13/18] workspace sql server section: increase install check --- workspace/Dockerfile-56 | 5 ++++- workspace/Dockerfile-70 | 4 +++- workspace/Dockerfile-71 | 4 +++- workspace/Dockerfile-72 | 4 +++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index b5756a58..7d8daea6 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -540,9 +540,12 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \ ARG INSTALL_MSSQL=false ENV INSTALL_MSSQL ${INSTALL_MSSQL} -RUN if [ ${INSTALL_MSSQL} = true ]; then \ +RUN set -eux; if [ ${INSTALL_MSSQL} = true ]; then \ apt-get -y install php5.6-sybase freetds-bin freetds-common libsybdb5 \ + && echo "extension=mssql.so" > /etc/php/5.6/cli/conf.d/20-mssql.ini \ && echo "extension=pdo_dblib.so" > /etc/php/5.6/cli/conf.d/20-pdo_dblib.ini \ + && php -m | grep -q 'mssql' \ + && php -m | grep -q 'pdo_dblib' \ ;fi ##################################### diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 340afeff..c2aa3c9e 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -536,7 +536,7 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \ ARG INSTALL_MSSQL=true ENV INSTALL_MSSQL ${INSTALL_MSSQL} -RUN if [ ${INSTALL_MSSQL} = true ]; then \ +RUN set -eux; if [ ${INSTALL_MSSQL} = true ]; then \ ##################################### # The following steps were taken from # https://github.com/Microsoft/msphpsql/wiki/Install-and-configuration @@ -563,6 +563,8 @@ RUN if [ ${INSTALL_MSSQL} = true ]; then \ locale-gen && \ echo "extension=sqlsrv.so" > /etc/php/7.0/cli/conf.d/20-sqlsrv.ini && \ echo "extension=pdo_sqlsrv.so" > /etc/php/7.0/cli/conf.d/20-pdo_sqlsrv.ini \ + && php -m | grep -q 'sqlsrv' \ + && php -m | grep -q 'pdo_sqlsrv' \ ;fi ##################################### diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index e7f80cfb..2df347cb 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -536,7 +536,7 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \ ARG INSTALL_MSSQL=false ENV INSTALL_MSSQL ${INSTALL_MSSQL} -RUN if [ ${INSTALL_MSSQL} = true ]; then \ +RUN set -eux; if [ ${INSTALL_MSSQL} = true ]; then \ ##################################### # The following steps were taken from # https://github.com/Microsoft/msphpsql/wiki/Install-and-configuration @@ -563,6 +563,8 @@ RUN if [ ${INSTALL_MSSQL} = true ]; then \ locale-gen && \ echo "extension=sqlsrv.so" > /etc/php/7.1/cli/conf.d/20-sqlsrv.ini && \ echo "extension=pdo_sqlsrv.so" > /etc/php/7.1/cli/conf.d/20-pdo_sqlsrv.ini \ + && php -m | grep -q 'sqlsrv' \ + && php -m | grep -q 'pdo_sqlsrv' \ ;fi ##################################### diff --git a/workspace/Dockerfile-72 b/workspace/Dockerfile-72 index f2b1cc5c..c4cfa8bb 100644 --- a/workspace/Dockerfile-72 +++ b/workspace/Dockerfile-72 @@ -536,7 +536,7 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \ ARG INSTALL_MSSQL=false ENV INSTALL_MSSQL ${INSTALL_MSSQL} -RUN if [ ${INSTALL_MSSQL} = true ]; then \ +RUN set -eux; if [ ${INSTALL_MSSQL} = true ]; then \ ##################################### # The following steps were taken from # https://github.com/Microsoft/msphpsql/wiki/Install-and-configuration @@ -563,6 +563,8 @@ RUN if [ ${INSTALL_MSSQL} = true ]; then \ locale-gen && \ echo "extension=sqlsrv.so" > /etc/php/7.2/cli/conf.d/20-sqlsrv.ini && \ echo "extension=pdo_sqlsrv.so" > /etc/php/7.2/cli/conf.d/20-pdo_sqlsrv.ini \ + && php -m | grep -q 'sqlsrv' \ + && php -m | grep -q 'pdo_sqlsrv' \ ;fi ##################################### From 9b85ac6c2b3e70f89c6477ba9924e9b2fff664ef Mon Sep 17 00:00:00 2001 From: red-smeg Date: Wed, 28 Mar 2018 14:46:19 -0400 Subject: [PATCH 14/18] Modify the sample config to support symfony 4 This allows Laradock to work with symfony 4 projects --- nginx/sites/symfony.conf.example | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nginx/sites/symfony.conf.example b/nginx/sites/symfony.conf.example index 67967157..acb0aad7 100644 --- a/nginx/sites/symfony.conf.example +++ b/nginx/sites/symfony.conf.example @@ -11,11 +11,17 @@ server { try_files $uri @rewriteapp; } + # For Symfony 3 location @rewriteapp { rewrite ^(.*)$ /app.php/$1 last; } + + # For Symfony 4 config + # location @rewriteapp { + # rewrite ^(.*)$ /index.php/$1 last; + # } - location ~ ^/(app|app_dev|config)\.php(/|$) { + location ~ ^/(app|app_dev|config|index)\.php(/|$) { fastcgi_pass php-upstream; fastcgi_split_path_info ^(.+\.php)(/.*)$; include fastcgi_params; From 83140d993954f1a590852002181c5b800e5012df Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Thu, 29 Mar 2018 15:34:38 +0800 Subject: [PATCH 15/18] fix #1418 elasticsearch up fails. --- docker-compose.yml | 3 --- elasticsearch/Dockerfile | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 61a40eab..1a7c8331 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -507,7 +507,6 @@ services: build: ./elasticsearch volumes: - elasticsearch-data:/usr/share/elasticsearch/data - - elasticsearch-plugins:/usr/share/elasticsearch/plugins environment: - cluster.name=laradock-cluster - bootstrap.memory_lock=true @@ -747,5 +746,3 @@ volumes: driver: "local" elasticsearch-data: driver: "local" - elasticsearch-plugins: - driver: "local" diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 914761ee..c82bd0c5 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -1,3 +1,3 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch:5.4.1 +FROM docker.elastic.co/elasticsearch/elasticsearch:6.2.3 EXPOSE 9200 9300 From 54e6d66c8375f46b46550ea22b67c351cb3d7438 Mon Sep 17 00:00:00 2001 From: Dearmadman Date: Fri, 30 Mar 2018 14:30:49 +0800 Subject: [PATCH 16/18] [feature] support for php worker hot load --- docker-compose.yml | 2 ++ php-worker/supervisord.conf | 9 ++------- php-worker/supervisord.d/laravel-worker.conf | 7 +++++++ 3 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 php-worker/supervisord.d/laravel-worker.conf diff --git a/docker-compose.yml b/docker-compose.yml index b46c350f..49ee20d3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -123,6 +123,8 @@ services: - INSTALL_PGSQL=${PHP_WORKER_INSTALL_PGSQL} volumes_from: - applications + volumes: + - ./php-worker/supervisord.d:/etc/supervisord.d depends_on: - workspace extra_hosts: diff --git a/php-worker/supervisord.conf b/php-worker/supervisord.conf index d0a2ece5..203f0148 100644 --- a/php-worker/supervisord.conf +++ b/php-worker/supervisord.conf @@ -6,10 +6,5 @@ port = 127.0.0.1:9001 [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface -[program:laravel-worker] -process_name=%(program_name)s_%(process_num)02d -command=php /var/www/artisan queue:work --sleep=3 --tries=3 --daemon -autostart=true -autorestart=true -numprocs=8 -redirect_stderr=true +[include] +files = supervisord.d/*.conf \ No newline at end of file diff --git a/php-worker/supervisord.d/laravel-worker.conf b/php-worker/supervisord.d/laravel-worker.conf new file mode 100644 index 00000000..cce9e923 --- /dev/null +++ b/php-worker/supervisord.d/laravel-worker.conf @@ -0,0 +1,7 @@ +[program:laravel-worker] +process_name=%(program_name)s_%(process_num)02d +command=php /var/www/artisan queue:work --sleep=3 --tries=3 --daemon +autostart=true +autorestart=true +numprocs=8 +redirect_stderr=true \ No newline at end of file From 5ed3526e178c6427213b5fe3a46a68ab958317fd Mon Sep 17 00:00:00 2001 From: Abdelrahman Omran Date: Mon, 2 Apr 2018 02:53:23 +0200 Subject: [PATCH 17/18] Fix minor typo! --- DOCUMENTATION/content/getting-started/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DOCUMENTATION/content/getting-started/index.md b/DOCUMENTATION/content/getting-started/index.md index 4d088aca..095b9ae9 100644 --- a/DOCUMENTATION/content/getting-started/index.md +++ b/DOCUMENTATION/content/getting-started/index.md @@ -176,7 +176,7 @@ docker-compose up -d nginx mysql **Note**: The `workspace` and `php-fpm` will run automatically in most of the cases, so no need to specify them in the `up` command. If you couldn't find them running then you need specify them as follow: `docker-compose up -d nginx php-fpm mysql workspace`. -You can select your own combination of containers form [this list](http://laradock.io/introduction/#supported-software-images). +You can select your own combination of containers from [this list](http://laradock.io/introduction/#supported-software-images). *(Please note that sometimes we forget to update the docs, so check the `docker-compose.yml` file to see an updated list of all available containers).* From 31a4e29c819a34e2ef835a42fb3cb307e461140f Mon Sep 17 00:00:00 2001 From: Daniel Hunsaker Date: Wed, 4 Apr 2018 06:13:11 -0600 Subject: [PATCH 18/18] Apply COPY vs ADD best practices Should only use `ADD` for URLs (and even then, `curl` or `wget` are preferred, for numerous reasons, even within this repo) and when extracting archive contents as part of the `ADD` operation; otherwise `COPY` is clearer and (slightly) more efficient. --- aerospike/Dockerfile | 2 +- hhvm/Dockerfile | 2 +- mariadb/Dockerfile | 2 +- mysql/Dockerfile | 2 +- nginx/Dockerfile | 2 +- percona/Dockerfile | 2 +- php-fpm/Dockerfile-56 | 4 ++-- php-fpm/Dockerfile-70 | 4 ++-- php-fpm/Dockerfile-71 | 4 ++-- php-fpm/Dockerfile-72 | 4 ++-- varnish/Dockerfile | 4 ++-- workspace/Dockerfile-56 | 4 ++-- workspace/Dockerfile-70 | 4 ++-- workspace/Dockerfile-71 | 4 ++-- workspace/Dockerfile-72 | 4 ++-- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/aerospike/Dockerfile b/aerospike/Dockerfile index e4a6e273..a85bc20c 100644 --- a/aerospike/Dockerfile +++ b/aerospike/Dockerfile @@ -4,4 +4,4 @@ LABEL maintainer="Luciano Jr " RUN rm /etc/aerospike/aerospike.conf -ADD aerospike.conf /etc/aerospike/aerospike.conf +COPY aerospike.conf /etc/aerospike/aerospike.conf diff --git a/hhvm/Dockerfile b/hhvm/Dockerfile index 1b10cded..e1b1f62e 100644 --- a/hhvm/Dockerfile +++ b/hhvm/Dockerfile @@ -15,7 +15,7 @@ RUN apt-get update -y \ RUN mkdir -p /var/www -ADD server.ini /etc/hhvm/server.ini +COPY server.ini /etc/hhvm/server.ini RUN usermod -u 1000 www-data diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile index 05b984f0..0dcb9481 100644 --- a/mariadb/Dockerfile +++ b/mariadb/Dockerfile @@ -2,7 +2,7 @@ FROM mariadb:latest LABEL maintainer="Mahmoud Zalt " -ADD my.cnf /etc/mysql/conf.d/my.cnf +COPY my.cnf /etc/mysql/conf.d/my.cnf CMD ["mysqld"] diff --git a/mysql/Dockerfile b/mysql/Dockerfile index c2811d5d..a3de8863 100644 --- a/mysql/Dockerfile +++ b/mysql/Dockerfile @@ -13,7 +13,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN chown -R mysql:root /var/lib/mysql/ -ADD my.cnf /etc/mysql/conf.d/my.cnf +COPY my.cnf /etc/mysql/conf.d/my.cnf CMD ["mysqld"] diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 5be25543..7af74fc3 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -2,7 +2,7 @@ FROM nginx:alpine LABEL maintainer="Mahmoud Zalt " -ADD nginx.conf /etc/nginx/ +COPY nginx.conf /etc/nginx/ # If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env. diff --git a/percona/Dockerfile b/percona/Dockerfile index 9a8b5c6a..3d3fd6d3 100644 --- a/percona/Dockerfile +++ b/percona/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="DTUNES " RUN chown -R mysql:root /var/lib/mysql/ -ADD my.cnf /etc/mysql/conf.d/my.cnf +COPY my.cnf /etc/mysql/conf.d/my.cnf CMD ["mysqld"] diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56 index 3290ff10..01dbf7c9 100644 --- a/php-fpm/Dockerfile-56 +++ b/php-fpm/Dockerfile-56 @@ -358,8 +358,8 @@ RUN php -v | head -n 1 | grep -q "PHP 5.6." #-------------------------------------------------------------------------- # -ADD ./laravel.ini /usr/local/etc/php/conf.d -ADD ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/ +COPY ./laravel.ini /usr/local/etc/php/conf.d +COPY ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/ #RUN rm -r /var/lib/apt/lists/* diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index 281a64f0..a5337272 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -380,8 +380,8 @@ RUN php -v | head -n 1 | grep -q "PHP 7.0." #-------------------------------------------------------------------------- # -ADD ./laravel.ini /usr/local/etc/php/conf.d/ -ADD ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/ +COPY ./laravel.ini /usr/local/etc/php/conf.d/ +COPY ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/ #RUN rm -r /var/lib/apt/lists/* diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index d87584cf..7b84785c 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -380,8 +380,8 @@ RUN php -v | head -n 1 | grep -q "PHP 7.1." #-------------------------------------------------------------------------- # -ADD ./laravel.ini /usr/local/etc/php/conf.d -ADD ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/ +COPY ./laravel.ini /usr/local/etc/php/conf.d +COPY ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/ #RUN rm -r /var/lib/apt/lists/* diff --git a/php-fpm/Dockerfile-72 b/php-fpm/Dockerfile-72 index c9ea138c..0d34a9a5 100644 --- a/php-fpm/Dockerfile-72 +++ b/php-fpm/Dockerfile-72 @@ -383,8 +383,8 @@ RUN php -v | head -n 1 | grep -q "PHP 7.2." #-------------------------------------------------------------------------- # -ADD ./laravel.ini /usr/local/etc/php/conf.d -ADD ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/ +COPY ./laravel.ini /usr/local/etc/php/conf.d +COPY ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/ #RUN rm -r /var/lib/apt/lists/* diff --git a/varnish/Dockerfile b/varnish/Dockerfile index 5da88e11..8cc4fbfb 100644 --- a/varnish/Dockerfile +++ b/varnish/Dockerfile @@ -19,8 +19,8 @@ ENV VARNISH_PORT 6081 ENV BACKEND_HOST localhost ENV BACKEND_PORT 80 -ADD default.vcl /etc/varnish/default.vcl -ADD start.sh /etc/varnish/start.sh +COPY default.vcl /etc/varnish/default.vcl +COPY start.sh /etc/varnish/start.sh RUN chmod +x /etc/varnish/start.sh diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index f3e1eb49..1c6680c9 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -209,8 +209,8 @@ RUN if [ ${INSTALL_XDEBUG} = false -a ${INSTALL_BLACKFIRE} = true ]; then \ ARG INSTALL_WORKSPACE_SSH=false ENV INSTALL_WORKSPACE_SSH ${INSTALL_WORKSPACE_SSH} -ADD insecure_id_rsa /tmp/id_rsa -ADD insecure_id_rsa.pub /tmp/id_rsa.pub +COPY insecure_id_rsa /tmp/id_rsa +COPY insecure_id_rsa.pub /tmp/id_rsa.pub RUN if [ ${INSTALL_WORKSPACE_SSH} = true ]; then \ rm -f /etc/service/sshd/down && \ diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index a240a1fd..212979fe 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -206,8 +206,8 @@ RUN if [ ${INSTALL_XDEBUG} = false -a ${INSTALL_BLACKFIRE} = true ]; then \ ARG INSTALL_WORKSPACE_SSH=false ENV INSTALL_WORKSPACE_SSH ${INSTALL_WORKSPACE_SSH} -ADD insecure_id_rsa /tmp/id_rsa -ADD insecure_id_rsa.pub /tmp/id_rsa.pub +COPY insecure_id_rsa /tmp/id_rsa +COPY insecure_id_rsa.pub /tmp/id_rsa.pub RUN if [ ${INSTALL_WORKSPACE_SSH} = true ]; then \ rm -f /etc/service/sshd/down && \ diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index 18b42a0b..8e253eb6 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -202,8 +202,8 @@ RUN if [ ${INSTALL_XDEBUG} = false -a ${INSTALL_BLACKFIRE} = true ]; then \ ARG INSTALL_WORKSPACE_SSH=false ENV INSTALL_WORKSPACE_SSH ${INSTALL_WORKSPACE_SSH} -ADD insecure_id_rsa /tmp/id_rsa -ADD insecure_id_rsa.pub /tmp/id_rsa.pub +COPY insecure_id_rsa /tmp/id_rsa +COPY insecure_id_rsa.pub /tmp/id_rsa.pub RUN if [ ${INSTALL_WORKSPACE_SSH} = true ]; then \ rm -f /etc/service/sshd/down && \ diff --git a/workspace/Dockerfile-72 b/workspace/Dockerfile-72 index 8e3cb9c3..727dc88c 100644 --- a/workspace/Dockerfile-72 +++ b/workspace/Dockerfile-72 @@ -203,8 +203,8 @@ RUN if [ ${INSTALL_XDEBUG} = false -a ${INSTALL_BLACKFIRE} = true ]; then \ ARG INSTALL_WORKSPACE_SSH=false ENV INSTALL_WORKSPACE_SSH ${INSTALL_WORKSPACE_SSH} -ADD insecure_id_rsa /tmp/id_rsa -ADD insecure_id_rsa.pub /tmp/id_rsa.pub +COPY insecure_id_rsa /tmp/id_rsa +COPY insecure_id_rsa.pub /tmp/id_rsa.pub RUN if [ ${INSTALL_WORKSPACE_SSH} = true ]; then \ rm -f /etc/service/sshd/down && \