From fe254e86e32f00a9806a25a4bf045c285eafa210 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Fri, 22 Sep 2017 13:10:08 +0300 Subject: [PATCH 1/4] Fixed typo in nginx [skip ci] --- DOCUMENTATION/content/documentation/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index 97e51e47..628c420a 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -1681,6 +1681,6 @@ This error sometimes happens because your Laravel application isn't running on t * Option B 1. Change the `DB_HOST` value to the same name as the MySQL docker container. The Laradock docker-compose file currently has this as `mysql` -## I get stuck when building ngxinx on `fetch http://mirrors.aliyun.com/alpine/v3.5/main/x86_64/APKINDEX.tar.gz` +## I get stuck when building nginx on `fetch http://mirrors.aliyun.com/alpine/v3.5/main/x86_64/APKINDEX.tar.gz` As stated on [#749](https://github.com/laradock/laradock/issues/749#issuecomment-293296687), removing the line `RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories` from `nginx/Dockerfile` solves the problem. From 998aa1365ed65e93fd2b35bde9a9fe086b15c671 Mon Sep 17 00:00:00 2001 From: luciano Date: Fri, 22 Sep 2017 12:23:20 +0100 Subject: [PATCH 2/4] Add aerospike.so line to be load on php-fpm --- php-fpm/aerospike.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/php-fpm/aerospike.ini b/php-fpm/aerospike.ini index 2f2aa1b7..f9c8f614 100644 --- a/php-fpm/aerospike.ini +++ b/php-fpm/aerospike.ini @@ -1,2 +1,3 @@ +extension=aerospike.so aerospike.udf.lua_system_path=/usr/local/aerospike/lua aerospike.udf.lua_user_path=/usr/local/aerospike/usr-lua \ No newline at end of file From 8cb4c8d62e6c5cf965298d665d3ee937c638d60a Mon Sep 17 00:00:00 2001 From: Taufek Johar Date: Sat, 23 Sep 2017 15:04:36 +0800 Subject: [PATCH 3/4] Add Terraform to Workspace Added Terraform (www.terraform.io) binary to workspace container. This tool is useful to spawn resources to multiple cloud providers via config files. --- docker-compose.yml | 1 + env-example | 1 + workspace/Dockerfile-56 | 15 +++++++++++++++ workspace/Dockerfile-70 | 15 +++++++++++++++ workspace/Dockerfile-71 | 15 +++++++++++++++ 5 files changed, 47 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index b44e8b77..1940b860 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,6 +38,7 @@ services: - INSTALL_PYTHON=${WORKSPACE_INSTALL_PYTHON} - INSTALL_IMAGE_OPTIMIZERS=${WORKSPACE_INSTALL_IMAGE_OPTIMIZERS} - INSTALL_IMAGEMAGICK=${WORKSPACE_INSTALL_IMAGEMAGICK} + - INSTALL_TERRAFORM=${WORKSPACE_INSTALL_TERRAFORM} - PUID=${WORKSPACE_PUID} - PGID=${WORKSPACE_PGID} - NODE_VERSION=${WORKSPACE_NODE_VERSION} diff --git a/env-example b/env-example index 7357b3ef..b026ae7c 100644 --- a/env-example +++ b/env-example @@ -51,6 +51,7 @@ WORKSPACE_INSTALL_SYMFONY=false WORKSPACE_INSTALL_PYTHON=false WORKSPACE_INSTALL_IMAGE_OPTIMIZERS=false WORKSPACE_INSTALL_IMAGEMAGICK=false +WORKSPACE_INSTALL_TERRAFORM=false WORKSPACE_PUID=1000 WORKSPACE_PGID=1000 WORKSPACE_NODE_VERSION=stable diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index bac3ee92..a3885523 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -509,6 +509,21 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ apt-get install -y --force-yes imagemagick php-imagick \ ;fi +##################################### +# Terraform: +##################################### +USER root +ARG INSTALL_TERRAFORM=false +ENV INSTALL_TERRAFORM ${INSTALL_TERRAFORM} +RUN if [ ${INSTALL_TERRAFORM} = true ]; then \ + apt-get update -yqq \ + && apt-get -y install sudo wget unzip \ + && wget https://releases.hashicorp.com/terraform/0.10.6/terraform_0.10.6_linux_amd64.zip \ + && unzip terraform_0.10.6_linux_amd64.zip \ + && mv terraform /usr/local/bin \ + && rm terraform_0.10.6_linux_amd64.zip \ +;fi + # #-------------------------------------------------------------------------- # Final Touch diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 20188169..297d26df 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -590,6 +590,21 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ apt-get install -y --force-yes imagemagick php-imagick \ ;fi +##################################### +# Terraform: +##################################### +USER root +ARG INSTALL_TERRAFORM=false +ENV INSTALL_TERRAFORM ${INSTALL_TERRAFORM} +RUN if [ ${INSTALL_TERRAFORM} = true ]; then \ + apt-get update -yqq \ + && apt-get -y install sudo wget unzip \ + && wget https://releases.hashicorp.com/terraform/0.10.6/terraform_0.10.6_linux_amd64.zip \ + && unzip terraform_0.10.6_linux_amd64.zip \ + && mv terraform /usr/local/bin \ + && rm terraform_0.10.6_linux_amd64.zip \ +;fi + # #-------------------------------------------------------------------------- # Final Touch diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index aeaec9c0..a57bff60 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -596,6 +596,21 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ apt-get install -y --force-yes imagemagick php-imagick \ ;fi +##################################### +# Terraform: +##################################### +USER root +ARG INSTALL_TERRAFORM=false +ENV INSTALL_TERRAFORM ${INSTALL_TERRAFORM} +RUN if [ ${INSTALL_TERRAFORM} = true ]; then \ + apt-get update -yqq \ + && apt-get -y install sudo wget unzip \ + && wget https://releases.hashicorp.com/terraform/0.10.6/terraform_0.10.6_linux_amd64.zip \ + && unzip terraform_0.10.6_linux_amd64.zip \ + && mv terraform /usr/local/bin \ + && rm terraform_0.10.6_linux_amd64.zip \ +;fi + # #-------------------------------------------------------------------------- # Final Touch From 8c1e71eca5d036920cc7dd14e959dbd695b78c77 Mon Sep 17 00:00:00 2001 From: Taufek Johar Date: Sun, 24 Sep 2017 22:15:59 +0800 Subject: [PATCH 4/4] Add artisan aliases Added below php artisan commonly used aliases: ``` dusk = php artisan dusk fresh = php artisan migrate:fresh refresh = php artisan migrate:refresh rollback = php artisan migrate:rollback ``` --- workspace/aliases.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/workspace/aliases.sh b/workspace/aliases.sh index 1bf21c65..3e9bbb6f 100644 --- a/workspace/aliases.sh +++ b/workspace/aliases.sh @@ -63,7 +63,11 @@ alias artisan="php artisan" alias cdump="composer dump-autoload -o" alias composer:dump="composer dump-autoload -o" alias db:reset="php artisan migrate:reset && php artisan migrate --seed" +alias dusk="php artisan dusk" +alias fresh="php artisan migrate:fresh" alias migrate="php artisan migrate" +alias refresh="php artisan migrate:refresh" +alias rollback="php artisan migrate:rollback" alias seed="php artisan:seed" alias phpunit="./vendor/bin/phpunit"