Merge pull request #1153 from taufek/tj-terraform

Add Terraform to Workspace
2017-09-24 00:56:25 +03:00 · 2017-09-23 15:49:55 +08:00 · 2017-09-22 19:32:19 +03:00 · 2017-09-22 19:31:55 +03:00 · 2017-09-22 12:23:20 +01:00 · 2017-09-22 13:10:08 +03:00
8 changed files with 49 additions and 4 deletions
--- 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.		
--- 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}
--- a/1
+++ b/1
@ -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
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@ -7,9 +7,6 @@ ADD nginx.conf /etc/nginx/
 ARG PHP_UPSTREAM_CONTAINER=php-fpm
 ARG PHP_UPSTREAM_PORT=9000

-# fix a problem--#397, change application source from dl-cdn.alpinelinux.org to aliyun source.
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories
-
 RUN apk update \
    && apk upgrade \
    && apk add --no-cache bash \
--- 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
--- 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
--- 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
--- 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
Author	SHA1	Message	Date
Mahmoud Zalt	c0e823b8d2	Merge pull request #1153 from taufek/tj-terraform Add Terraform to Workspace	2017-09-24 00:56:25 +03:00
Taufek Johar	8cb4c8d62e	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.	2017-09-23 15:49:55 +08:00
Mahmoud Zalt	f765afd4c2	Merge pull request #1151 from luciano-jr/AddAerospikeExtensionOnPhpFpm Add aerospike.so line to be load on php-fpm	2017-09-22 19:32:19 +03:00
Mahmoud Zalt	6ea49a0683	Merge pull request #1150 from samdark/fix-typo Fixed typo in "nginx"	2017-09-22 19:31:55 +03:00
luciano	998aa1365e	Add aerospike.so line to be load on php-fpm	2017-09-22 12:23:20 +01:00
Alexander Makarov	fe254e86e3	Fixed typo in nginx [skip ci]	2017-09-22 13:10:08 +03:00
Mahmoud Zalt	53b7f75500	Merge pull request #1145 from vjekoslav/master Fixes issue #1139, non-responding mirrors.aliyun.com. Reverses 6440ca…	2017-09-20 20:09:47 +03:00
Vjekoslav Nikolic	4150f0b140	Fixes issue #1139 , non-responding mirrors.aliyun.com. Reverses `6440ca841a`	2017-09-20 05:44:36 -07:00