Merge pull request #684 from laradock/revert-639-master

Revert "Add apache conf file for specific virtualhost ServerName"

.env

@@ -0,0 +1 @@
+COMPOSE_CONVERT_WINDOWS_PATHS=1

.gitignore

@@ -1,4 +1,3 @@
 .idea
 /logs
 /data
-.env

apache2/Dockerfile

@@ -15,6 +15,3 @@ WORKDIR /var/www/public
 ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"]
 
 CMD ["supervisord"]
-
-# Update the default apache site with the config we created.
-ADD apache-config.conf /etc/apache2/sites-enabled/000-default.conf

apache2/apache-config.conf

@@ -1,16 +0,0 @@
-<VirtualHost *:$WEB_SERVER_PORT>
-  ServerAdmin me@mydomain.com
-  DocumentRoot ${WEB_DOCUMENT_ROOT}
-  ServerName ${SERVER_ALIAS}
-
-  <Directory ${WEB_DOCUMENT_ROOT}>
-      Options Indexes FollowSymLinks MultiViews
-      AllowOverride All
-      Order deny,allow
-      Allow from all
-  </Directory>
-
-  ErrorLog ${APACHE_LOG_DIR}/error.log
-  CustomLog ${APACHE_LOG_DIR}/access.log combined
-
-</VirtualHost>

docker-compose.yml

@@ -77,16 +77,6 @@ services:
             # IMPORTANT: Set the Remote Interpreter entry matching name to `laravel`
             - PHP_IDE_CONFIG=serverName=laravel
 
-### PHP-WORKER Container #######################################
-
-    php-worker:
-        build:
-            context: ./php-fpm
-            dockerfile: Dockerfile-70 # or Dockerfile-56, choose your PHP-FPM container setting
-        volumes_from:
-            - applications
-        command: php artisan queue:work
-
 ### Nginx Server Container ##################################
 
     nginx:
@@ -117,8 +107,8 @@ services:
         volumes:
             - ./logs/apache2:/var/log/apache2
         ports:
-            - "$SERVER_PORT:80"
+            - "80:80"
-            - "$SERVER_SSL_PORT:443"
+            - "443:443"
         links:
             - php-fpm
 
@@ -151,14 +141,14 @@ services:
         build:
             context: ./mysql
             args:
-                - MYSQL_DATABASE=$DB_DATABASE
+                - MYSQL_DATABASE=homestead
-                - MYSQL_USER=$DB_USERNAME
+                - MYSQL_USER=homestead
-                - MYSQL_PASSWORD=$DB_PASSWORD
+                - MYSQL_PASSWORD=secret
                 - MYSQL_ROOT_PASSWORD=root
         volumes:
             - mysql:/var/lib/mysql
         ports:
-            - "$DB_PORT:3306"
+            - "3306:3306"
 
 ### MariaDB Container #######################################
 
@@ -169,9 +159,9 @@ services:
         ports:
             - "3306:3306"
         environment:
-            MYSQL_DATABASE: $DB_DATABASE
+            MYSQL_DATABASE: homestead
-            MYSQL_USER: $DB_USERNAME
+            MYSQL_USER: homestead
-            MYSQL_PASSWORD: $DB_PASSWORD
+            MYSQL_PASSWORD: secret
             MYSQL_ROOT_PASSWORD: root
 
 ### PostgreSQL Container ####################################
@@ -183,9 +173,9 @@ services:
         ports:
             - "5432:5432"
         environment:
-            POSTGRES_DB: $DB_DATABASE
+            POSTGRES_DB: homestead
-            POSTGRES_USER: $DB_USERNAME
+            POSTGRES_USER: homestead
-            POSTGRES_PASSWORD: $DB_PASSWORD
+            POSTGRES_PASSWORD: secret
 
 ### PostgreSQL PostGis Container ############################
 
@@ -196,9 +186,9 @@ services:
         ports:
             - "5432:5432"
         environment:
-            POSTGRES_DB: $DB_DATABASE
+            POSTGRES_DB: homestead
-            POSTGRES_USER: $DB_USERNAME
+            POSTGRES_USER: homestead
-            POSTGRES_PASSWORD: $DB_PASSWORD
+            POSTGRES_PASSWORD: secret
 
 ### Neo4j Container #########################################
 
@@ -322,8 +312,8 @@ services:
         build: ./phpmyadmin
         environment:
             PMA_ARBITRARY: 1
-            MYSQL_USER: $DB_USERNAME
+            MYSQL_USER: homestead
-            MYSQL_PASSWORD: $DB_PASSWORD
+            MYSQL_PASSWORD: secret
             MYSQL_ROOT_PASSWORD: root
         ports:
             - "8080:80"