- Eliminato .env dal repo git per poterlo linkare nel progetto locale

- Impostata configurazione dinamica porte per apache
This commit is contained in:
Riccardo Tribbia 2017-03-01 15:55:33 +01:00
parent 4947dfaad1
commit 8317fbde5c
4 changed files with 22 additions and 22 deletions

1
.env
View File

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

1
.gitignore vendored
View File

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

View File

@ -1,9 +1,9 @@
<VirtualHost *:8888>
<VirtualHost *:$WEB_SERVER_PORT>
ServerAdmin me@mydomain.com
DocumentRoot /var/www/site
ServerName local.mydomain.com
DocumentRoot ${WEB_DOCUMENT_ROOT}
ServerName ${SERVER_ALIAS}
<Directory /var/www/site/>
<Directory ${WEB_DOCUMENT_ROOT}>
Options Indexes FollowSymLinks MultiViews
AllowOverride All
Order deny,allow

View File

@ -104,8 +104,8 @@ services:
volumes:
- ./logs/apache2:/var/log/apache2
ports:
- "80:80"
- "443:443"
- "$SERVER_PORT:80"
- "$SERVER_SSL_PORT:443"
links:
- php-fpm
@ -126,14 +126,14 @@ services:
build:
context: ./mysql
args:
- MYSQL_DATABASE=homestead
- MYSQL_USER=homestead
- MYSQL_PASSWORD=secret
- MYSQL_DATABASE=$DB_DATABASE
- MYSQL_USER=$DB_USERNAME
- MYSQL_PASSWORD=$DB_PASSWORD
- MYSQL_ROOT_PASSWORD=root
volumes:
- mysql:/var/lib/mysql
ports:
- "3306:3306"
- "$DB_PORT:3306"
### MariaDB Container #######################################
@ -144,9 +144,9 @@ services:
ports:
- "3306:3306"
environment:
MYSQL_DATABASE: homestead
MYSQL_USER: homestead
MYSQL_PASSWORD: secret
MYSQL_DATABASE: $DB_DATABASE
MYSQL_USER: $DB_USERNAME
MYSQL_PASSWORD: $DB_PASSWORD
MYSQL_ROOT_PASSWORD: root
### PostgreSQL Container ####################################
@ -158,9 +158,9 @@ services:
ports:
- "5432:5432"
environment:
POSTGRES_DB: homestead
POSTGRES_USER: homestead
POSTGRES_PASSWORD: secret
POSTGRES_DB: $DB_DATABASE
POSTGRES_USER: $DB_USERNAME
POSTGRES_PASSWORD: $DB_PASSWORD
### PostgreSQL PostGis Container ############################
@ -171,9 +171,9 @@ services:
ports:
- "5432:5432"
environment:
POSTGRES_DB: homestead
POSTGRES_USER: homestead
POSTGRES_PASSWORD: secret
POSTGRES_DB: $DB_DATABASE
POSTGRES_USER: $DB_USERNAME
POSTGRES_PASSWORD: $DB_PASSWORD
### Neo4j Container #########################################
@ -297,8 +297,8 @@ services:
build: ./phpmyadmin
environment:
PMA_ARBITRARY: 1
MYSQL_USER: homestead
MYSQL_PASSWORD: secret
MYSQL_USER: $DB_USERNAME
MYSQL_PASSWORD: $DB_PASSWORD
MYSQL_ROOT_PASSWORD: root
ports:
- "8080:80"