coop-cloud/xwiki
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hardcode db_user rather than using a secret

Browse Source
This commit is contained in:
Ammar Hussein 2024-11-19 12:56:40 -08:00
parent d109adfecd
commit 74883023f3
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.sample
View File

@ -7,6 +7,5 @@ DOMAIN=xwiki.example.com
LETS_ENCRYPT_ENV=production LETS_ENCRYPT_ENV=production
SECRET_DB_USERNAME_VERSION=v1
SECRET_DB_PASSWORD_VERSION=v1 SECRET_DB_PASSWORD_VERSION=v1
SECRET_DB_ROOT_PASSWORD_VERSION=v1 SECRET_DB_ROOT_PASSWORD_VERSION=v1

9
compose.yml
View File

@ -4,14 +4,13 @@ services:
app: app:
image: "xwiki:stable-mysql-tomcat" image: "xwiki:stable-mysql-tomcat"
environment: environment:
- DB_USER_FILE=/run/secrets/db_username - DB_USER=xwiki
- DB_PASSWORD_FILE=/run/secrets/db_password - DB_PASSWORD_FILE=/run/secrets/db_password
- DB_DATABASE=xwiki - DB_DATABASE=xwiki
- DB_HOST=${STACK_NAME}_db - DB_HOST=${STACK_NAME}_db
volumes: volumes:
- xwiki-data:/usr/local/xwiki - xwiki-data:/usr/local/xwiki
secrets: secrets:
- db_username
- db_password - db_password
networks: networks:
- proxy - proxy
@ -44,7 +43,7 @@ services:
- mysql-data:/var/lib/mysql - mysql-data:/var/lib/mysql
environment: environment:
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
- MYSQL_USER_FILE=/run/secrets/db_username - MYSQL_USER=xwiki
- MYSQL_PASSWORD_FILE=/run/secrets/db_password - MYSQL_PASSWORD_FILE=/run/secrets/db_password
- MYSQL_DATABASE=xwiki - MYSQL_DATABASE=xwiki
command: command:
@ -52,7 +51,6 @@ services:
- "--collation-server=utf8mb4_bin" - "--collation-server=utf8mb4_bin"
- "--explicit-defaults-for-timestamp=1" - "--explicit-defaults-for-timestamp=1"
secrets: secrets:
- db_username
- db_password - db_password
- db_root_password - db_root_password
@ -66,9 +64,6 @@ volumes:
xwiki-data: xwiki-data:
secrets: secrets:
db_username:
name: ${STACK_NAME}_db_username_${SECRET_DB_USERNAME_VERSION}
external: true
db_password: db_password:
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION} name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
external: true external: true