giles
/
stack
Archived
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'home-deploy' into remote
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Giles Bradshaw 2020-04-28 09:09:23 +01:00
parent e2ec8a0ec0 c758f6fa1e
commit 64aa35bdb5
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
docker-compose-home.yml
View File

@ -264,8 +264,8 @@ services:
condition: any condition: any
image: ${LOCAL_DOCKER_REGISTRY}guacamole-postgresql:latest image: ${LOCAL_DOCKER_REGISTRY}guacamole-postgresql:latest
environment: environment:
POSTGRES_PASSWORD: guacroot POSTGRES_PASSWORD: ${GUACAMOLE_POSTGRES_PASSWORD}
POSTGRES_DB: guacamole_db POSTGRES_DB: ${GUACAMOLE_POSTGRES_DB}
volumes: volumes:
- guacamole-postgresql-data:/var/lib/postgresql/data - guacamole-postgresql-data:/var/lib/postgresql/data
networks: networks:
@ -291,19 +291,12 @@ services:
restart_policy: restart_policy:
condition: any condition: any
image: guacamole/guacamole:latest image: guacamole/guacamole:latest
secrets:
- source: guacamole-postgresql-database
target: database
- source: guacamole-postgresql-user
target: user
- source: guacamole-postgresql-password
target: password
environment: environment:
- POSTGRES_HOSTNAME=guacamole-postgresql - POSTGRES_HOSTNAME=guacamole-postgresql
- POSTGRES_PORT=5432 - POSTGRES_PORT=5432
- POSTGRES_USER_FILE=/run/secrets/user - POSTGRES_USER=${GUACAMOLE_POSTGRES_USER}
- POSTGRES_PASSWORD_FILE=/run/secrets/password - POSTGRES_PASSWORD=${GUACAMOLE_POSTGRES_PASSWORD}
- POSTGRES_DATABASE_FILE=/run/secrets/database - POSTGRES_DATABASE=${GUACAMOLE_POSTGRES_DB}
- GUACD_HOSTNAME=guacd - GUACD_HOSTNAME=guacd
networks: networks:
- appnet - appnet
@ -379,11 +372,5 @@ secrets:
file: .certificates/registry.crt file: .certificates/registry.crt
'registry-key': 'registry-key':
file: .certificates/registry.key file: .certificates/registry.key
'guacamole-postgresql-database':
file: .secrets/guacamole-postgresql-database
'guacamole-postgresql-user':
file: .secrets/guacamole-postgresql-user
'guacamole-postgresql-password':
file: .secrets/guacamole-postgresql-password
'ngrok-auth-token': 'ngrok-auth-token':
file: .secrets/ngrok-auth-token file: .secrets/ngrok-auth-token

10
docker-compose-remote.yml
View File

@ -178,8 +178,8 @@ services:
condition: any condition: any
image: ${LOCAL_DOCKER_REGISTRY}guacamole-postgresql:latest image: ${LOCAL_DOCKER_REGISTRY}guacamole-postgresql:latest
environment: environment:
POSTGRES_PASSWORD: guacroot POSTGRES_PASSWORD: ${GUACAMOLE_POSTGRES_PASSWORD}
POSTGRES_DB: guacamole_db POSTGRES_DB: ${GUACAMOLE_POSTGRES_DB}
volumes: volumes:
- guacamole-postgresql-data:/var/lib/postgresql/data - guacamole-postgresql-data:/var/lib/postgresql/data
#secrets: #secrets:
@ -220,9 +220,9 @@ services:
environment: environment:
- POSTGRES_HOSTNAME=guacamole-postgresql - POSTGRES_HOSTNAME=guacamole-postgresql
- POSTGRES_PORT=5432 - POSTGRES_PORT=5432
- POSTGRES_USER_FILE=/run/secrets/user - POSTGRES_USER=${GUACAMOLE_POSTGRES_USER}
- POSTGRES_PASSWORD_FILE=/run/secrets/password - POSTGRES_PASSWORD=${GUACAMOLE_POSTGRES_PASSWORD}
- POSTGRES_DATABASE_FILE=/run/secrets/database - POSTGRES_DATABASE=${GUACAMOLE_POSTGRES_DB}
- GUACD_HOSTNAME=guacd - GUACD_HOSTNAME=guacd
networks: networks:
- appnet - appnet