-
Notifications
You must be signed in to change notification settings - Fork 186
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
45 changed files
with
586 additions
and
597 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,136 +1,141 @@ | ||
| ####################################### | ||
| # PHP application Docker container | ||
| # | ||
| # for this container you have to remove | ||
| # following entries from .dockerignore: | ||
| # | ||
| # etc/* | ||
| # provision/* | ||
| # app/* | ||
| # | ||
| ####################################### | ||
| app: | ||
| build: . | ||
| dockerfile: Dockerfile.cloud | ||
| links: | ||
| - mysql | ||
| #- postgres | ||
| #- solr | ||
| #- elasticsearch | ||
| #- redis | ||
| #- memcached | ||
| #- ftp | ||
| ports: | ||
| - "8000:80" | ||
| - "8443:443" | ||
| - "10022:22" | ||
| volumes_from: | ||
| - storage | ||
| env_file: | ||
| - etc/environment.yml | ||
| - etc/environment.production.yml | ||
| version: '2' | ||
| services: | ||
| ####################################### | ||
| # PHP application Docker container | ||
| # | ||
| # for this container you have to remove | ||
| # following entries from .dockerignore: | ||
| # | ||
| # etc/* | ||
| # provision/* | ||
| # app/* | ||
| # | ||
| ####################################### | ||
| app: | ||
| build: | ||
| context: . | ||
| dockerfile: Dockerfile.cloud | ||
| links: | ||
| - mysql | ||
| #- postgres | ||
| #- solr | ||
| #- elasticsearch | ||
| #- redis | ||
| #- memcached | ||
| #- ftp | ||
| ports: | ||
| - "8000:80" | ||
| - "8443:443" | ||
| - "10022:22" | ||
| volumes_from: | ||
| - storage | ||
| env_file: | ||
| - etc/environment.yml | ||
| - etc/environment.production.yml | ||
|
|
||
| ####################################### | ||
| # MySQL server | ||
| ####################################### | ||
| mysql: | ||
| build: docker/mysql | ||
| #dockerfile: MySQL-5.5 | ||
| dockerfile: MySQL-5.6 | ||
| #dockerfile: MySQL-5.7 | ||
| #dockerfile: MariaDB-5.5 | ||
| #dockerfile: MariaDB-10 | ||
| #dockerfile: Percona-5.5 | ||
| #dockerfile: Percona-5.6 | ||
| volumes_from: | ||
| - storage | ||
| env_file: | ||
| - etc/environment.yml | ||
| - etc/environment.production.yml | ||
| ####################################### | ||
| # MySQL server | ||
| ####################################### | ||
| mysql: | ||
| build: | ||
| context: docker/mysql/ | ||
| #dockerfile: MySQL-5.5.Dockerfile | ||
| dockerfile: MySQL-5.6.Dockerfile | ||
| #dockerfile: MySQL-5.7.Dockerfile | ||
| #dockerfile: MariaDB-5.5.Dockerfile | ||
| #dockerfile: MariaDB-10.Dockerfile | ||
| #dockerfile: Percona-5.5.Dockerfile | ||
| #dockerfile: Percona-5.6.Dockerfile | ||
| #dockerfile: Percona-5.7.Dockerfile | ||
| volumes_from: | ||
| - storage | ||
| env_file: | ||
| - etc/environment.yml | ||
| - etc/environment.production.yml | ||
|
|
||
| ####################################### | ||
| # PostgreSQL server | ||
| ####################################### | ||
| #postgres: | ||
| # build: docker/postgres/ | ||
| # volumes_from: | ||
| # - storage | ||
| # env_file: | ||
| # - etc/environment.yml | ||
| # - etc/environment.production.yml | ||
| ####################################### | ||
| # PostgreSQL server | ||
| ####################################### | ||
| #postgres: | ||
| # build: | ||
| # context: docker/postgres/ | ||
| # dockerfile: Postgres-9.4.Dockerfile | ||
| # dockerfile: Postgres-9.5.Dockerfile | ||
| # volumes_from: | ||
| # - storage | ||
| # env_file: | ||
| # - etc/environment.yml | ||
| # - etc/environment.production.yml | ||
|
|
||
| ####################################### | ||
| # Solr server | ||
| ####################################### | ||
| #solr: | ||
| # build: docker/solr/ | ||
| # volumes_from: | ||
| # - storage | ||
| # environment: | ||
| # - SOLR_STORAGE=/storage/solr/server-master/ | ||
| # env_file: | ||
| # - etc/environment.yml | ||
| # - etc/environment.production.yml | ||
| ####################################### | ||
| # Solr server | ||
| ####################################### | ||
| #solr: | ||
| # build: | ||
| # context: docker/solr/ | ||
| # volumes_from: | ||
| # - storage | ||
| # environment: | ||
| # - SOLR_STORAGE=/storage/solr/server-master/ | ||
| # env_file: | ||
| # - etc/environment.yml | ||
| # - etc/environment.production.yml | ||
|
|
||
| ####################################### | ||
| # Elasticsearch | ||
| ####################################### | ||
| #elasticsearch: | ||
| # build: docker/elasticsearch/ | ||
| # volumes_from: | ||
| # - storage | ||
| # env_file: | ||
| # - etc/environment.yml | ||
| # - etc/environment.production.yml | ||
| ####################################### | ||
| # Elasticsearch | ||
| ####################################### | ||
| #elasticsearch: | ||
| # build: | ||
| # context: docker/elasticsearch/ | ||
| # volumes_from: | ||
| # - storage | ||
| # env_file: | ||
| # - etc/environment.yml | ||
| # - etc/environment.production.yml | ||
|
|
||
| ####################################### | ||
| # Redis | ||
| ####################################### | ||
| #redis: | ||
| # build: docker/redis/ | ||
| # volumes_from: | ||
| # - storage | ||
| # env_file: | ||
| # - etc/environment.yml | ||
| # - etc/environment.production.yml | ||
| ####################################### | ||
| # Redis | ||
| ####################################### | ||
| #redis: | ||
| # build: | ||
| # context: docker/redis/ | ||
| # volumes_from: | ||
| # - storage | ||
| # env_file: | ||
| # - etc/environment.yml | ||
| # - etc/environment.production.yml | ||
|
|
||
| ####################################### | ||
| # Memcached | ||
| ####################################### | ||
| #memcached: | ||
| # build: docker/memcached/ | ||
| # volumes_from: | ||
| # - storage | ||
| # env_file: | ||
| # - etc/environment.yml | ||
| # - etc/environment.production.yml | ||
| ####################################### | ||
| # Memcached | ||
| ####################################### | ||
| #memcached: | ||
| # build: | ||
| # context: docker/memcached/ | ||
| # volumes_from: | ||
| # - storage | ||
| # env_file: | ||
| # - etc/environment.yml | ||
| # - etc/environment.production.yml | ||
|
|
||
| ####################################### | ||
| # Mailcatcher | ||
| ####################################### | ||
| #mail: | ||
| # build: docker/mail/ | ||
| # env_file: | ||
| # - etc/environment.yml | ||
| # - etc/environment.production.yml | ||
| ####################################### | ||
| # FTP (vsftpd) | ||
| ####################################### | ||
| #ftp: | ||
| # build: | ||
| # context: docker/vsftpd/ | ||
| # volumes_from: | ||
| # - sourcecode | ||
| # - storage | ||
| # env_file: | ||
| # - etc/environment.yml | ||
| # - etc/environment.production.yml | ||
|
|
||
| ####################################### | ||
| # FTP (vsftpd) | ||
| ####################################### | ||
| #ftp: | ||
| # build: docker/vsftpd/ | ||
| # volumes_from: | ||
| # - sourcecode | ||
| # - storage | ||
| # env_file: | ||
| # - etc/environment.yml | ||
| # - etc/environment.production.yml | ||
|
|
||
| ####################################### | ||
| # Storage | ||
| ####################################### | ||
| storage: | ||
| build: docker/storage/ | ||
| volumes: | ||
| - /storage | ||
| ####################################### | ||
| # Storage | ||
| ####################################### | ||
| storage: | ||
| build: | ||
| context: docker/storage/ | ||
| volumes: | ||
| - /storage |
Oops, something went wrong.