Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/port to v3 #7

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Prepare local datas directories :

## Connect to PHPMyAdmin

- url: [http://localhost:8181]()
- url: [http://localhost:8181](http://localhost:8181)
- user: *root*
- password: *password*

Expand All @@ -59,7 +59,7 @@ Double-click on *./webstart.jnlp* to start the Mirth-Connect client

or

browse to [http://localhost:8080]() to access web client.
browse to [http://localhost:8080](http://localhost:8080) to access web client.

## Using host filesystem in MirthConnect

Expand Down
23 changes: 8 additions & 15 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
version: '2'
version: '3'

networks:
frontend:
backend:

volumes:
mysql_db:
driver: local
mysql_log:
driver: local
nginx_log:
driver: local

services:

Expand All @@ -27,9 +24,6 @@ services:
ports:
- "8080:8080"
- "8443:8443"
links:
- mirth-database:mysql
- rp-https:rp-https
networks:
- frontend
- backend
Expand All @@ -42,12 +36,10 @@ services:
image: phpmyadmin/phpmyadmin:latest
restart: on-failure
ports:
- "8181:80"
- "127.0.0.1:8181:80"
environment:
- "MYSQL_USERNAME=root"
- "MYSQL_PASSWORD=password"
links:
- mirth-database:db
- "PMA_HOST=mirth-database"
- "MYSQL_ROOT_PASSWORD=password"
networks:
- frontend
- backend
Expand All @@ -56,12 +48,13 @@ services:

mirth-database:
container_name: mc-mysql
hostname: mysql
image: mysql:5.6
command: mysqld --innodb-buffer-pool-size=20M
restart: on-failure
volumes:
- "mysql_db:/var/lib/mysql:rw"
- "mysql_log:/var/log/mysql:rw"
- "mysql_db:/var/lib/mysql"
- "mysql_log:/var/log/mysql"
environment:
- "MYSQL_DATABASE=mirth-test"
- "MYSQL_USER=mirth"
Expand All @@ -76,7 +69,7 @@ services:
image: nginx:latest
restart: on-failure
ports:
- 7980:7980 # for from host reverse testing
- "7980:7980"
volumes:
- "./data/rp-https/conf/nginx/nginx.conf:/etc/nginx/nginx.conf:ro"
- "./data/rp-https/conf/nginx/conf.d/:/etc/nginx/conf.d/:ro"
Expand Down