Skip to content

Commit 484f690

Browse files
author
Erwin Dondorp
committed
prevent conflict with local saltstack, closes #753
1 parent 9dca7b4 commit 484f690

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

docker/docker-compose-tls.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@ services:
44
image: erwindon/saltgui-saltmaster-tls:3007.6
55
hostname: saltmaster-local
66
ports:
7-
- 4505:4505
8-
- 4506:4506
7+
# for SaltGUI (https)
98
- 3334:3334
9+
# for additional minions, enable as needed
10+
# but note that this may conflict a local saltstack
11+
#- 4505:4505
12+
#- 4506:4506
1013
volumes:
1114
- ./srv/:/srv/
1215
- ./conf/master-tls:/etc/salt/master

docker/docker-compose.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ services:
44
image: erwindon/saltgui-saltmaster:3007.6
55
hostname: saltmaster-local
66
ports:
7+
# for SaltGUI (http)
78
- 3333:3333
9+
# for additional minions, enable as needed
10+
# but note that this may conflict a local saltstack
11+
#- 4505:4505
12+
#- 4506:4506
813
volumes:
914
- ./srv/:/srv/
1015
- ./conf/master:/etc/salt/master

0 commit comments

Comments
 (0)