diff --git a/docker-compose.override.yml b/docker-compose.override.yml deleted file mode 100644 index 1237110..0000000 Binary files a/docker-compose.override.yml and /dev/null differ diff --git a/docker-compose.yml b/docker-compose.yml index eb8c3be..65de9bc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -64,6 +64,8 @@ services: container_name: transmission environment: <<: *common-environment + FILE__USER: /run/secrets/transmission-user + FILE__PASS: /run/secrets/transmission-pw volumes: - transmission-config:/config - /mnt/storage/download:/downloads @@ -73,6 +75,9 @@ services: - 51413:51413 - 51413:51413/udp restart: unless-stopped + secrets: + - transmission-user + - transmission-pw # WIP # radarr: @@ -94,13 +99,12 @@ services: syncthing: image: lscr.io/linuxserver/syncthing:latest container_name: syncthing - hostname: drmanhattan #optional + hostname: drmanhattan environment: *common-environment volumes: - ./syncthing:/config - /mnt/storage/music/Florent:/music ports: - #- 8384:8384 - 22000:22000/tcp - 22000:22000/udp - 21027:21027/udp @@ -115,10 +119,13 @@ services: - lychee-db:/config environment: <<: *common-environment - MYSQL_ROOT_PASSWORD: rootpassword + FILE__MYSQL_ROOT_PASSWORD: /run/secrets/lychee-db-root-pw + FILE__MYSQL_PASSWORD: /run/secrets/lychee-db-pw MYSQL_DATABASE: lychee MYSQL_USER: lychee - MYSQL_PASSWORD: dbpassword + secrets: + - lychee-db-root-pw + - lychee-db-pw lychee: @@ -132,11 +139,13 @@ services: - lychee-pictures:/pictures environment: <<: *common-environment + FILE__DB_PASSWORD: /run/secrets/lychee-db-pw DB_HOST: lychee-db DB_USERNAME: lychee - DB_PASSWORD: dbpassword DB_DATABASE: lychee DB_PORT: 3306 + secrets: + - lychee-db-pw # WIP # zotero: @@ -227,7 +236,15 @@ volumes: secrets: + lychee-db-root-pw: + file: lychee-db-root-pw.secret + lychee-db-pw: + file: lychee-db-pw.secret nextcloud-db-root-pw: file: nextcloud-db-root-pw.secret nextcloud-db-pw: file: nextcloud-db-pw.secret + transmission-user: + file: transmission-user.secret + transmission-pw: + file: transmission-pw.secret diff --git a/lychee-db-pw.secret b/lychee-db-pw.secret new file mode 100644 index 0000000..1ae551c Binary files /dev/null and b/lychee-db-pw.secret differ diff --git a/lychee-db-root-pw.secret b/lychee-db-root-pw.secret new file mode 100644 index 0000000..6ff0287 Binary files /dev/null and b/lychee-db-root-pw.secret differ diff --git a/transmission-pw.secret b/transmission-pw.secret new file mode 100644 index 0000000..7a71b83 Binary files /dev/null and b/transmission-pw.secret differ diff --git a/transmission-user.secret b/transmission-user.secret new file mode 100644 index 0000000..d38f34b Binary files /dev/null and b/transmission-user.secret differ