Merge pull request #757 from hounded/master

Symfony support in workspace

DOCUMENTATION/_settings/content/documentation/index.md

@@ -1375,8 +1375,6 @@ git clone https://github.com/IFSight/d4m-nfs ~/d4m-nfs
 
 ```txt
 /Users:/Users
-/Volumes:/Volumes
-/private:/private
 ```
 
 5) Create (or edit) the file `/etc/exports`, make sure it exists and is empty. (There may be collisions if you come from Vagrant or if you already executed the `d4m-nfs.sh` script before).

docker-compose.yml

@@ -29,12 +29,13 @@ services:
           - INSTALL_DEPLOYER=${WORKSPACE_INSTALL_LARAVEL_ENVOY}
           - INSTALL_LINUXBREW=${WORKSPACE_INSTALL_LARAVEL_ENVOY}
           - INSTALL_MC=${WORKSPACE_INSTALL_MC}
+          - INSTALL_SYMFONY=${WORKSPACE_INSTALL_SYMFONY}
           - PUID=${WORKSPACE_PUID}
           - PGID=${WORKSPACE_PGID}
           - NODE_VERSION=${WORKSPACE_NODE_VERSION}
           - YARN_VERSION=${WORKSPACE_YARN_VERSION}
           - TZ=${WORKSPACE_TIMEZONE}
-        dockerfile: "dockerfile-${PHP_VERSION}"
+        dockerfile: "Dockerfile-${PHP_VERSION}"
       volumes_from:
         - applications
       extra_hosts:
@@ -65,7 +66,7 @@ services:
           - INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI}
           - INSTALL_TOKENIZER=${PHP_FPM_INSTALL_TOKENIZER}
           - INSTALL_INTL=${PHP_FPM_INSTALL_INTL}
-        dockerfile: "dockerfile-${PHP_VERSION}"
+        dockerfile: "Dockerfile-${PHP_VERSION}"
       volumes_from:
         - applications
       expose:

docs/documentation/index.html

@@ -1423,8 +1423,6 @@ e) set it to <code>true</code></p>
 <p>4) Create (or edit) the file <code>~/d4m-nfs/etc/d4m-nfs-mounts.txt</code>, and write the follwing configuration in it:</p>
 
 <pre><code class="language-txt">/Users:/Users
-/Volumes:/Volumes
-/private:/private
 </code></pre>
 
 <p>5) Create (or edit) the file <code>/etc/exports</code>, make sure it exists and is empty. (There may be collisions if you come from Vagrant or if you already executed the <code>d4m-nfs.sh</code> script before).</p>

docs/documentation/index.xml

@@ -1126,8 +1126,6 @@ e) set it to <code>true</code></p>
 <p>4) Create (or edit) the file <code>~/d4m-nfs/etc/d4m-nfs-mounts.txt</code>, and write the follwing configuration in it:</p>
 
 <pre><code class="language-txt">/Users:/Users
-/Volumes:/Volumes
-/private:/private
 </code></pre>
 
 <p>5) Create (or edit) the file <code>/etc/exports</code>, make sure it exists and is empty. (There may be collisions if you come from Vagrant or if you already executed the <code>d4m-nfs.sh</code> script before).</p>

docs/index.html

@@ -1828,8 +1828,6 @@ e) set it to <code>true</code></p>
 <p>4) Create (or edit) the file <code>~/d4m-nfs/etc/d4m-nfs-mounts.txt</code>, and write the follwing configuration in it:</p>
 
 <pre><code class="language-txt">/Users:/Users
-/Volumes:/Volumes
-/private:/private
 </code></pre>
 
 <p>5) Create (or edit) the file <code>/etc/exports</code>, make sure it exists and is empty. (There may be collisions if you come from Vagrant or if you already executed the <code>d4m-nfs.sh</code> script before).</p>

docs/index.xml

@@ -1540,8 +1540,6 @@ e) set it to <code>true</code></p>
 <p>4) Create (or edit) the file <code>~/d4m-nfs/etc/d4m-nfs-mounts.txt</code>, and write the follwing configuration in it:</p>
 
 <pre><code class="language-txt">/Users:/Users
-/Volumes:/Volumes
-/private:/private
 </code></pre>
 
 <p>5) Create (or edit) the file <code>/etc/exports</code>, make sure it exists and is empty. (There may be collisions if you come from Vagrant or if you already executed the <code>d4m-nfs.sh</code> script before).</p>

env-example

@@ -26,6 +26,7 @@ WORKSPACE_INSTALL_LARAVEL_ENVOY=false
 WORKSPACE_INSTALL_DEPLOYER=false
 WORKSPACE_INSTALL_LINUXBREW=false
 WORKSPACE_INSTALL_MC=false
+WORKSPACE_INSTALL_SYMFONY=false
 WORKSPACE_PUID=1000
 WORKSPACE_PGID=1000
 WORKSPACE_NODE_VERSION=stable

php-fpm/Dockerfile-56

@@ -83,8 +83,7 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
 ARG INSTALL_ZIP_ARCHIVE=false
 RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
     # Install the zip extension
-    pecl install zip && \
-    docker-php-ext-enable zip \
+    docker-php-ext-install zip \
 ;fi
 
 #####################################

php-fpm/Dockerfile-70

@@ -92,8 +92,7 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
 ARG INSTALL_ZIP_ARCHIVE=false
 RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
     # Install the zip extension
-    pecl install zip && \
-    docker-php-ext-enable zip \
+    docker-php-ext-install zip \
 ;fi
 
 #####################################

php-fpm/Dockerfile-71

@@ -69,8 +69,7 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
 ARG INSTALL_ZIP_ARCHIVE=false
 RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
     # Install the zip extension
-    pecl install zip && \
-    docker-php-ext-enable zip \
+    docker-php-ext-install zip \
 ;fi
 
 #####################################

workspace/Dockerfile-70

@@ -388,6 +388,28 @@ RUN if [ ${INSTALL_MC} = true ]; then\
     chmod +x /usr/local/bin/mc \
 ;fi
 
+#####################################
+# Symfony:
+#####################################
+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
+
 USER laradock
 
 #