Merge pull request #1168 from nunomazer/master

Add pecl before mongo install on Dockerfile-56 to stop mongodb breaking building
Add pecl before mongo install
2017-09-29 00:57:45 +03:00 · 2017-09-28 17:16:05 -03:00 · 2017-09-28 19:22:37 +03:00 · 2017-09-28 16:59:21 +03:00 · 2017-09-25 23:32:49 +03:00 · 2017-09-25 18:30:00 +01:00
11 changed files with 63 additions and 13 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/Dockerfile-70
+++ b/php-fpm/Dockerfile-70
@ -173,11 +173,11 @@ ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE}
 COPY ./aerospike.ini /usr/local/etc/php/conf.d/aerospike.ini
 RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
    # Install the php aerospike extension
-    curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/3.4.14.tar.gz" \
+    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 \
    && tar -C aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \
    && ( \
-        cd aerospike-client-php/src/aerospike \
+        cd aerospike-client-php/src \
        && phpize \
        && ./build.sh \
        && make install \
--- a/php-fpm/Dockerfile-71
+++ b/php-fpm/Dockerfile-71
@ -61,7 +61,7 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
    docker-php-ext-enable xdebug \
 ;fi

-# Copy xdebug configration for remote debugging
+# Copy xdebug configuration for remote debugging
 COPY ./xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini

 #####################################
@ -179,11 +179,11 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
    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/3.4.14.tar.gz" \
+    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 \
    && tar -C aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \
    && ( \
-        cd aerospike-client-php/src/aerospike \
+        cd aerospike-client-php/src \
        && phpize \
        && ./build.sh \
        && make install \
--- 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
@ -189,6 +189,7 @@ ARG INSTALL_MONGO=false
 ENV INSTALL_MONGO ${INSTALL_MONGO}
 RUN if [ ${INSTALL_MONGO} = true ]; then \
    # Install the mongodb extension
+    pecl channel-update pecl.php.net && \
    pecl install mongodb && \
    echo "extension=mongodb.so" >> /etc/php/5.6/mods-available/mongodb.ini && \
    ln -s /etc/php/5.6/mods-available/mongodb.ini /etc/php/5.6/cli/conf.d/30-mongodb.ini \
@ -509,6 +510,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
@ -323,11 +323,11 @@ COPY ./aerospike.ini /etc/php/7.0/cli/conf.d/aerospike.ini

 RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
    # Install the php aerospike extension
-    curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/3.4.14.tar.gz" \
+    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 \
    && tar -C aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \
    && ( \
-        cd aerospike-client-php/src/aerospike \
+        cd aerospike-client-php/src \
        && phpize \
        && ./build.sh \
        && make install \
@ -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
@ -325,11 +325,11 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
    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/3.4.14.tar.gz" \
+    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 \
    && tar -C aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \
    && ( \
-        cd aerospike-client-php/src/aerospike \
+        cd aerospike-client-php/src \
        && phpize \
        && ./build.sh \
        && make install \
@ -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
--- 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"
Author	SHA1	Message	Date
Mahmoud Zalt	1281490c39	Merge pull request #1168 from nunomazer/master Add pecl before mongo install on Dockerfile-56 to stop mongodb breaking building	2017-09-29 00:57:45 +03:00
Ademir Mazer Jr [ Nuno ]	3f7988060e	Add pecl before mongo install	2017-09-28 17:16:05 -03:00
Mahmoud Zalt	615cb72eab	Merge pull request #1167 from ifdattic/patch-1 Fix typo	2017-09-28 19:22:37 +03:00
Andrew Marcinkevičius	e036e69da2	Fix typo	2017-09-28 16:59:21 +03:00
Mahmoud Zalt	8989c73711	Merge pull request #1163 from luciano-jr/FixAerospikeClientLink Fix aerospike client link	2017-09-25 23:32:49 +03:00
luciano	61144ab2d9	Change the wrong link to aerospike client PHP	2017-09-25 18:30:00 +01:00
Luciano Jr	221edf4bb2	Merge pull request #23 from laradock/master Just update the fork	2017-09-25 18:17:10 +01:00
Mahmoud Zalt	5a073ae841	Merge pull request #1158 from taufek/tj-aliases-update Add artisan aliases	2017-09-25 01:16:41 +03:00
Taufek Johar	8c1e71eca5	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 ```	2017-09-24 22:16:04 +08:00
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
Luciano Jr	f2420ec52c	Merge pull request #22 from laradock/master Just update the fork	2017-09-22 12:13:42 +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
Luciano Jr	d3fb967f0f	Merge pull request #21 from laradock/master Up-to-date	2017-09-04 10:49:41 +01:00
Luciano Jr	bf691337f1	Merge pull request #20 from laradock/master Just update the fork	2017-05-24 17:56:05 +01:00
Luciano Jr	d616545268	Merge pull request #19 from laradock/master Just update the fork	2017-03-14 13:00:16 +00:00
Luciano Jr	57ecd6e515	Merge pull request #18 from laradock/master Just update the fork repository	2017-03-07 13:22:10 +00:00
Luciano Jr	5b5ba53112	Merge pull request #17 from laradock/master Just update the fork project	2017-01-23 16:06:25 +00:00
Luciano Jr	bd87a26db1	Merge pull request #16 from laradock/master Just update the fork	2017-01-09 17:46:36 +00:00
Luciano Jr	c0283da6ee	Merge pull request #15 from laradock/master Just update the fork to keep sync	2016-12-30 11:34:19 +00:00
Luciano Jr	e372d624a6	Merge pull request #14 from laradock/master Just update the fork repository	2016-12-07 13:18:41 +00:00
Luciano Jr	db6c6e7e0f	Merge pull request #13 from luciano-jr/feature/vue-cli-workspace Add vue-cli on workspace npm global installers	2016-09-06 23:44:14 +01:00