Use new style secret naming
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
bd5ea14e85
commit
04677bed91
|
@ -15,9 +15,9 @@ steps:
|
||||||
DOMAIN: keycloak.swarm-test.autonomic.zone
|
DOMAIN: keycloak.swarm-test.autonomic.zone
|
||||||
STACK_NAME: keycloak
|
STACK_NAME: keycloak
|
||||||
LETS_ENCRYPT_ENV: production
|
LETS_ENCRYPT_ENV: production
|
||||||
ADMIN_PASSWD_VERSION: v1
|
SECRET_ADMIN_PASSWORD_VERSION: v1
|
||||||
DB_PASSWD_VERSION: v1
|
SECRET_DB_PASSWORD_VERSION: v1
|
||||||
DB_ROOT_PASSWD_VERSION: v1
|
SECRET_DB_ROOT_PASSWORD_VERSION: v1
|
||||||
trigger:
|
trigger:
|
||||||
branch:
|
branch:
|
||||||
- master
|
- master
|
||||||
|
|
|
@ -7,6 +7,6 @@ LETS_ENCRYPT_ENV=production
|
||||||
|
|
||||||
ADMIN_USERNAME=admin
|
ADMIN_USERNAME=admin
|
||||||
|
|
||||||
DB_ROOT_PASSWORD_VERSION=v1
|
SECRET_DB_ROOT_PASSWORD_VERSION=v1
|
||||||
DB_PASSWORD_VERSION=v1
|
SECRET_DB_PASSWORD_VERSION=v1
|
||||||
ADMIN_PASSWORD_VERSION=v1
|
SECRET_ADMIN_PASSWORD_VERSION=v1
|
||||||
|
|
28
compose.yml
28
compose.yml
|
@ -8,15 +8,15 @@ services:
|
||||||
- proxy
|
- proxy
|
||||||
- internal
|
- internal
|
||||||
secrets:
|
secrets:
|
||||||
- admin_passwd
|
- admin_password
|
||||||
- db_passwd
|
- db_password
|
||||||
environment:
|
environment:
|
||||||
- DB_ADDR=db
|
- DB_ADDR=db
|
||||||
- DB_DATABASE=keycloak
|
- DB_DATABASE=keycloak
|
||||||
- DB_PASSWORD_FILE=/run/secrets/db_passwd
|
- DB_PASSWORD_FILE=/run/secrets/db_password
|
||||||
- DB_USER=keycloak
|
- DB_USER=keycloak
|
||||||
- DB_VENDOR=mariadb
|
- DB_VENDOR=mariadb
|
||||||
- KEYCLOAK_PASSWORD_FILE=/run/secrets/admin_passwd
|
- KEYCLOAK_PASSWORD_FILE=/run/secrets/admin_password
|
||||||
- KEYCLOAK_USER=${ADMIN_USERNAME}
|
- KEYCLOAK_USER=${ADMIN_USERNAME}
|
||||||
- PROXY_ADDRESS_FORWARDING=true
|
- PROXY_ADDRESS_FORWARDING=true
|
||||||
healthcheck:
|
healthcheck:
|
||||||
|
@ -46,11 +46,11 @@ services:
|
||||||
environment:
|
environment:
|
||||||
- MYSQL_DATABASE=keycloak
|
- MYSQL_DATABASE=keycloak
|
||||||
- MYSQL_USER=keycloak
|
- MYSQL_USER=keycloak
|
||||||
- MYSQL_PASSWORD_FILE=/run/secrets/db_passwd
|
- MYSQL_PASSWORD_FILE=/run/secrets/db_password
|
||||||
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_passwd
|
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
|
||||||
secrets:
|
secrets:
|
||||||
- db_passwd
|
- db_password
|
||||||
- db_root_passwd
|
- db_root_password
|
||||||
volumes:
|
volumes:
|
||||||
- "mariadb:/var/lib/mysql"
|
- "mariadb:/var/lib/mysql"
|
||||||
networks:
|
networks:
|
||||||
|
@ -62,14 +62,14 @@ networks:
|
||||||
external: true
|
external: true
|
||||||
|
|
||||||
secrets:
|
secrets:
|
||||||
admin_passwd:
|
admin_password:
|
||||||
name: ${STACK_NAME}_admin_passwd_${ADMIN_PASSWD_VERSION}
|
name: ${STACK_NAME}_admin_password_${SECRET_ADMIN_PASSWORD_VERSION}
|
||||||
external: true
|
external: true
|
||||||
db_passwd:
|
db_password:
|
||||||
name: ${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION}
|
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
|
||||||
external: true
|
external: true
|
||||||
db_root_passwd:
|
db_root_password:
|
||||||
name: ${STACK_NAME}_db_root_passwd_${DB_ROOT_PASSWD_VERSION}
|
name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
|
||||||
external: true
|
external: true
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
|
|
Loading…
Reference in New Issue