general clean up
This commit is contained in:
		@@ -8,8 +8,8 @@ services:
 | 
				
			|||||||
        build:
 | 
					        build:
 | 
				
			||||||
            context: ./workspace
 | 
					            context: ./workspace
 | 
				
			||||||
            args:
 | 
					            args:
 | 
				
			||||||
                - INSTALL_MONGO=false
 | 
					 | 
				
			||||||
                - INSTALL_XDEBUG=false
 | 
					                - INSTALL_XDEBUG=false
 | 
				
			||||||
 | 
					                - INSTALL_MONGO=false
 | 
				
			||||||
                - INSTALL_NODE=false
 | 
					                - INSTALL_NODE=false
 | 
				
			||||||
                - INSTALL_DRUSH=false
 | 
					                - INSTALL_DRUSH=false
 | 
				
			||||||
                - COMPOSER_GLOBAL_INSTALL=false
 | 
					                - COMPOSER_GLOBAL_INSTALL=false
 | 
				
			||||||
@@ -18,9 +18,7 @@ services:
 | 
				
			|||||||
        volumes_from:
 | 
					        volumes_from:
 | 
				
			||||||
            - volumes_source
 | 
					            - volumes_source
 | 
				
			||||||
        extra_hosts:
 | 
					        extra_hosts:
 | 
				
			||||||
            # IMPORTANT: Replace with your Docker Host IP
 | 
					            # IMPORTANT: Replace with your Docker Host IP (will be appended to /etc/hosts)
 | 
				
			||||||
            # this will be appended to /etc/hosts
 | 
					 | 
				
			||||||
            # Note that this IP can perhaps be better injected via .env
 | 
					 | 
				
			||||||
            - "dockerhost:10.0.75.1"
 | 
					            - "dockerhost:10.0.75.1"
 | 
				
			||||||
        tty: true
 | 
					        tty: true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -30,8 +28,8 @@ services:
 | 
				
			|||||||
        build:
 | 
					        build:
 | 
				
			||||||
            context: ./php-fpm
 | 
					            context: ./php-fpm
 | 
				
			||||||
            args:
 | 
					            args:
 | 
				
			||||||
                - INSTALL_MONGO=false
 | 
					 | 
				
			||||||
                - INSTALL_XDEBUG=false
 | 
					                - INSTALL_XDEBUG=false
 | 
				
			||||||
 | 
					                - INSTALL_MONGO=false
 | 
				
			||||||
                - INSTALL_ZIP_ARCHIVE=false
 | 
					                - INSTALL_ZIP_ARCHIVE=false
 | 
				
			||||||
                - INSTALL_MEMCACHED=false
 | 
					                - INSTALL_MEMCACHED=false
 | 
				
			||||||
                - INSTALL_OPCACHE=false
 | 
					                - INSTALL_OPCACHE=false
 | 
				
			||||||
@@ -43,15 +41,10 @@ services:
 | 
				
			|||||||
        links:
 | 
					        links:
 | 
				
			||||||
            - workspace
 | 
					            - workspace
 | 
				
			||||||
        extra_hosts:
 | 
					        extra_hosts:
 | 
				
			||||||
            # IMPORTANT: Replace with your Docker Host IP
 | 
					            # IMPORTANT: Replace with your Docker Host IP (will be appended to /etc/hosts)
 | 
				
			||||||
            # this will be appended to /etc/hosts
 | 
					 | 
				
			||||||
            # Note that this IP can perhaps be better injected via .env
 | 
					 | 
				
			||||||
            - "dockerhost:10.0.75.1"
 | 
					            - "dockerhost:10.0.75.1"
 | 
				
			||||||
        environment:
 | 
					        environment:
 | 
				
			||||||
            # IMPORTANT: You must have a Remote Interpreter entry matching this name
 | 
					            # IMPORTANT: Set the Remote Interpreter entry matching name to `laravel`
 | 
				
			||||||
            # In settings, search for interpreter...
 | 
					 | 
				
			||||||
            # PHP > Languages & Frameworks > PHP > Interpreter > click on [...]
 | 
					 | 
				
			||||||
            # Need to have a Remote Interpreter named 'laravel'
 | 
					 | 
				
			||||||
            - PHP_IDE_CONFIG="serverName=laravel"
 | 
					            - PHP_IDE_CONFIG="serverName=laravel"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
### Nginx Server Container ##################################
 | 
					### Nginx Server Container ##################################
 | 
				
			||||||
@@ -221,18 +214,10 @@ services:
 | 
				
			|||||||
        build: ./volumes/application
 | 
					        build: ./volumes/application
 | 
				
			||||||
        volumes:
 | 
					        volumes:
 | 
				
			||||||
            - ../:/var/www/laravel
 | 
					            - ../:/var/www/laravel
 | 
				
			||||||
 | 
					            # Demonstration of how to mount multiple sites
 | 
				
			||||||
            # By default, site_a and site_b are mirroring the parent Laravel app.
 | 
					 | 
				
			||||||
            # This is because the nginx container has these domains
 | 
					 | 
				
			||||||
            # enabled to demonstrate how to support multiple sites
 | 
					 | 
				
			||||||
            - ../:/var/www/site_a
 | 
					 | 
				
			||||||
            - ../:/var/www/site_b
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            # This demonstrates example of where you may mount sites
 | 
					 | 
				
			||||||
            # - ../../site_a/:/var/www/site_a
 | 
					            # - ../../site_a/:/var/www/site_a
 | 
				
			||||||
            # - ../../site_b/:/var/www/site_b
 | 
					            # - ../../site_b/:/var/www/site_b
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
### Databases Data Container ################################
 | 
					### Databases Data Container ################################
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    volumes_data:
 | 
					    volumes_data:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,7 +11,6 @@ server {
 | 
				
			|||||||
    # This is the full path to your index file
 | 
					    # This is the full path to your index file
 | 
				
			||||||
    index index.php index.html index.htm;
 | 
					    index index.php index.html index.htm;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
    ## serve imagecache files directly or redirect to drupal if they do not exist.
 | 
					    ## serve imagecache files directly or redirect to drupal if they do not exist.
 | 
				
			||||||
    location ~* files/styles {
 | 
					    location ~* files/styles {
 | 
				
			||||||
      access_log off;
 | 
					      access_log off;
 | 
				
			||||||
@@ -43,7 +42,6 @@ server {
 | 
				
			|||||||
        rewrite ^/(.*)$ /index.php?q=$1 last;
 | 
					        rewrite ^/(.*)$ /index.php?q=$1 last;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
    location @rewrite {
 | 
					    location @rewrite {
 | 
				
			||||||
        # Some modules enforce no slash (/) at the end of the URL
 | 
					        # Some modules enforce no slash (/) at the end of the URL
 | 
				
			||||||
        # Else this rewrite block wouldn't be needed (GlobalRedirect)
 | 
					        # Else this rewrite block wouldn't be needed (GlobalRedirect)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
#! /bin/bash
 | 
					#! /bin/bash
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# NOTE: At the moment, this has only been confirmed to work PHP 7
 | 
					# NOTE: At the moment, this has only been confirmed to work with PHP 7
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Grab full name of php-fpm container
 | 
					# Grab full name of php-fpm container
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user