Skip to content

Commit

Permalink
Merge pull request #40 from universityofadelaide/settings-php-defaults
Browse files Browse the repository at this point in the history
Simplify docker compose and dsh
  • Loading branch information
acbramley authored Aug 6, 2018
2 parents 0a20716 + e6bb38c commit 8157adf
Show file tree
Hide file tree
Showing 6 changed files with 119 additions and 357 deletions.
45 changes: 45 additions & 0 deletions docker-compose.linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
version: '3'
services:
web:
image: uofa/apache2-php7-dev:foundation
# This makes the container run on the same network stack as your
# workstation. Meaning that you can interact on "localhost".
network_mode: host
environment:
SITE_TITLE: WCMS D8
SITE_MAIL: [email protected]
SITE_ADMIN_EMAIL: [email protected]
SITE_ADMIN_USERNAME: admin
SITE_ADMIN_PASSWORD: password
PUBLIC_DIR: /shared/public
HASH_SALT: random-hash
CONFIG_SYNC_DIRECTORY: /shared/private/random-hash/sync
SHEPHERD_SITE_ID: 2
SHEPHERD_URL: http://shepherd.test
SHEPHERD_TOKEN: super-secret-token
SHEPHERD_INSTALL_PROFILE: ua
REDIS_ENABLED: 1
SHEPHERD_SECRET_PATH: /code/private
XDEBUG_CONFIG: "remote_host=127.0.0.1"
PHP_IDE_CONFIG: serverName=localhost
volumes:
- .:/code
- ./shared:/shared
- $HOME/.ssh/id_rsa:/root/.ssh/id_rsa

db:
image: mariadb
network_mode: host
environment:
MYSQL_DATABASE: drupal
MYSQL_USER: user
MYSQL_PASSWORD: password
MYSQL_ROOT_PASSWORD: super-secret-password

mail:
image: mailhog/mailhog
network_mode: host

redis:
image: redis:alpine
network_mode: host
55 changes: 55 additions & 0 deletions docker-compose.osx.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
version: '3'
services:
web:
image: uofa/apache2-php7-dev:foundation
# You will notice that we are forwarding port which do not belong to PHP.
# We have to declare them here because these "sidecar" services are sharing
# THIS containers network stack.
ports:
- "80:80"
- "3306:3306"
- "8025:8025"
environment:
SITE_TITLE: WCMS D8
SITE_MAIL: [email protected]
SITE_ADMIN_EMAIL: [email protected]
SITE_ADMIN_USERNAME: admin
SITE_ADMIN_PASSWORD: password
PUBLIC_DIR: /shared/public
HASH_SALT: random-hash
CONFIG_SYNC_DIRECTORY: /shared/private/random-hash/sync
SHEPHERD_SITE_ID: 2
SHEPHERD_URL: http://shepherd.test
SHEPHERD_TOKEN: super-secret-token
SHEPHERD_INSTALL_PROFILE: ua
REDIS_ENABLED: 1
SHEPHERD_SECRET_PATH: /code/private
XDEBUG_CONFIG: "remote_host=docker.for.mac.localhost"
PHP_IDE_CONFIG: serverName=localhost
volumes:
- .:/code
- ./shared:/shared
- $HOME/.ssh/id_rsa:/root/.ssh/id_rsa

xdebug:
image: nickschuch/d4m-tcp-forwarder
network_mode: host
environment:
- PORT=9000

db:
image: mariadb
network_mode: service:web
environment:
MYSQL_DATABASE: drupal
MYSQL_USER: user
MYSQL_PASSWORD: password
MYSQL_ROOT_PASSWORD: super-secret-password

mail:
image: mailhog/mailhog
network_mode: service:web

redis:
image: redis:alpine
network_mode: service:web
42 changes: 0 additions & 42 deletions docker-compose.yml

This file was deleted.

Loading

0 comments on commit 8157adf

Please sign in to comment.