Skip to content

Commit

Permalink
Merge pull request #3 from UKHomeOffice/maildev
Browse files Browse the repository at this point in the history
Add maildev to docker-compose for testing e-mails
  • Loading branch information
paulwaitehomeoffice authored May 10, 2017
2 parents adef099 + 96194d8 commit 7488526
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .docker-compose/keycloak.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MYSQL_USERNAME=keycloak
MYSQL_PASSWORD=password
MYSQL_PORT_3306_TCP_ADDR=127.0.0.1
MYSQL_PORT_3306_TCP_ADDR=mariadb
MYSQL_PORT_3306_TCP_PORT=3306
21 changes: 16 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
keycloak-db:
container_name: keycloak-db
mariadb:
container_name: mariadb
image: mariadb:latest
net: container:keycloak
ports:
- "3306"
environment:
MYSQL_DATABASE: "keycloak"
MYSQL_PASSWORD: "password"
Expand All @@ -13,17 +14,27 @@ keycloak:
image: quay.io/ukhomeofficedigital/keycloak-mysql:latest
ports:
- "8080:8080"
links:
- mariadb
- maildev
volumes:
- ./.docker-compose/keycloak.env:/etc/secrets/keycloak.env
- ./themes/2.5.4_0.19.2_2.2.1/govuk_0.19.2_2.2.1/:/opt/jboss/keycloak/themes/govuk_latest/
environment:
KEYCLOAK_ENVIRONMENT: "/etc/secrets/keycloak.env"
KEYCLOAK_PASSWORD: "admin"
KEYCLOAK_USER: "admin"
MYSQL_PORT_3306_TCP_ADDR: "127.0.0.1"
MYSQL_PORT_3306_TCP_ADDR: "mariadb"
MYSQL_PORT_3306_TCP_PORT: "3306"
WAIT_ON_ADDR: "127.0.0.1"
WAIT_ON_ADDR: "mariadb"
WAIT_ON_PORT: "3306"
PROXY_ADDRESS_FORWARDING: "true"
command:
- -b 0.0.0.0 --server-config=standalone.xml

maildev:
container_name: maildev
image: djfarrelly/maildev
ports:
- "8081:80"
- "25"

0 comments on commit 7488526

Please sign in to comment.