From 32e559a833850073cbfb3cd78e8e93f65e1d9b67 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Tue, 14 Apr 2020 21:16:39 +0200 Subject: [PATCH] remove unnecessary variables I've learned this from the Jitsi config that you don't have to add a variable if the key name is the same in the compose file as it is in the .env file --- bookstack/docker-compose.yml | 18 +++++++++--------- docker-mailserver/docker-compose.yml | 14 +++++++------- gitea/docker-compose.yml | 18 +++++++++--------- librenms/docker-compose.yml | 6 +++++- nextcloud/docker-compose.yml | 28 ++++++++++++++-------------- pihole/docker-compose.yml | 10 +++++----- plex/docker-compose.yml | 4 ++-- rainloop/docker-compose.yml | 8 ++++---- ttrss/docker-compose.yml | 18 +++++++++--------- wallabag/docker-compose.yml | 22 +++++++++++----------- 10 files changed, 75 insertions(+), 71 deletions(-) diff --git a/bookstack/docker-compose.yml b/bookstack/docker-compose.yml index cc3d00a..ef0bb8a 100644 --- a/bookstack/docker-compose.yml +++ b/bookstack/docker-compose.yml @@ -8,14 +8,14 @@ image: linuxserver/bookstack container_name: bookstack environment: - - "PUID=${PUID}" - - "PGID=${PGID}" - - "TZ=${TZ}" - - "DB_HOST=${DB_HOST}" + - PUID + - PGID + - TZ + - DB_HOST - "DB_USER=${MYSQL_USER}" - "DB_PASS=${MYSQL_PASSWORD}" - "DB_DATABASE=${MYSQL_DATABASE}" - - "APP_URL=${APP_URL}" + - APP_URL volumes: - ./config:/config depends_on: @@ -30,10 +30,10 @@ db: image: mariadb:10.3 environment: - - "MYSQL_RANDOM_ROOT_PASSWORD=${MYSQL_RANDOM_ROOT_PASSWORD}" - - "MYSQL_DATABASE=${MYSQL_DATABASE}" - - "MYSQL_USER=${MYSQL_USER}" - - "MYSQL_PASSWORD=${MYSQL_PASSWORD}" + - MYSQL_RANDOM_ROOT_PASSWORD + - MYSQL_DATABASE + - MYSQL_USER + - MYSQL_PASSWORD volumes: - db:/var/lib/mysql restart: unless-stopped diff --git a/docker-mailserver/docker-compose.yml b/docker-mailserver/docker-compose.yml index 5f9709b..fb8d442 100644 --- a/docker-mailserver/docker-compose.yml +++ b/docker-mailserver/docker-compose.yml @@ -32,13 +32,13 @@ services: cap_add: - NET_ADMIN environment: - - "PUID=${PUID}" - - "PGID=${PGID}" - - "TZ=${TZ}" - - "URL=${URL}" - - "VALIDATION=${VALIDATION}" - - "EMAIL=${EMAIL}" - - "DHLEVEL=${DHLEVEL}" + - PUID + - PGID + - TZ + - URL + - VALIDATION + - EMAIL + - DHLEVEL volumes: - ./letsencrypt:/config ports: diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml index b384e3b..8a2e2ac 100644 --- a/gitea/docker-compose.yml +++ b/gitea/docker-compose.yml @@ -16,17 +16,17 @@ services: gitea: image: gitea/gitea:1 environment: - - "USER_UID=${USER_UID}" - - "USER_GID=${USER_GID}" - - "DB_TYPE=${DB_TYPE}" + - USER_UID + - USER_GID + - DB_TYPE - "DB_HOST=db:${DB_PORT}" - "DB_NAME=${MYSQL_DATABASE}" - "DB_USER=${MYSQL_USER}" - "DB_PASSWD=${MYSQL_PASSWORD}" - "ROOT_URL=${APP_DOMAIN}" - INSTALL_LOCK=true - - "SECRET_KEY=${SECRET_KEY}" - - "DISABLE_REGISTRATION=${DISABLE_REGISTRATION}" + - SECRET_KEY + - DISABLE_REGISTRATION volumes: - ./data:/data - /etc/timezone:/etc/timezone:ro @@ -50,8 +50,8 @@ services: volumes: - db:/var/lib/mysql environment: - - "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" - - "MYSQL_PASSWORD=${MYSQL_PASSWORD}" - - "MYSQL_DATABASE=${MYSQL_DATABASE}" - - "MYSQL_USER=${MYSQL_USER}" + - MYSQL_ROOT_PASSWORD + - MYSQL_PASSWORD + - MYSQL_DATABASE + - MYSQL_USER restart: unless-stopped diff --git a/librenms/docker-compose.yml b/librenms/docker-compose.yml index 5fe4f5a..77b7061 100644 --- a/librenms/docker-compose.yml +++ b/librenms/docker-compose.yml @@ -14,7 +14,11 @@ services: volumes: - "./db:/var/lib/mysql" environment: - - MYSQL_ALLOW_EMPTY_PASSWORD="yes" + - TZ + - "MYSQL_ALLOW_EMPTY_PASSWORD=yes" + - MYSQL_DATABASE + - MYSQL_USER + - MYSQL_PASSWORD restart: always memcached: diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index 1d71d37..3537c10 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -20,9 +20,9 @@ services: - db:/var/lib/mysql environment: - MYSQL_RANDOM_ROOT_PASSWORD=yes - - "MYSQL_PASSWORD=${MYSQL_PASSWORD}" - - "MYSQL_DATABASE=${MYSQL_DATABASE}" - - "MYSQL_USER=${MYSQL_USER}" + - MYSQL_PASSWORD + - MYSQL_DATABASE + - MYSQL_USER redis: image: redis:alpine @@ -31,20 +31,20 @@ services: app: build: ./nextcloud environment: - - "MYSQL_PASSWORD=${MYSQL_PASSWORD}" - - "MYSQL_DATABASE=${MYSQL_DATABASE}" - - "MYSQL_USER=${MYSQL_USER}" + - MYSQL_PASSWORD + - MYSQL_DATABASE + - MYSQL_USER - MYSQL_HOST=db - - "NEXTCLOUD_ADMIN_USER=${NEXTCLOUD_ADMIN_USER}" - - "NEXTCLOUD_ADMIN_PASSWORD=${NEXTCLOUD_ADMIN_PASSWORD}" + - NEXTCLOUD_ADMIN_USER + - NEXTCLOUD_ADMIN_PASSWORD - "NEXTCLOUD_TRUSTED_DOMAINS=${APP_DOMAIN} ${NEXTCLOUD_TRUSTED_DOMAINS}" - REDIS_HOST=redis - - "SMTP_HOST=${SMTP_HOST}" - - "SMTP_SECURE=${SMTP_SECURE}" - - "SMTP_PORT=${SMTP_PORT}" - - "SMTP_NAME=${SMTP_NAME}" - - "SMTP_PASSWORD=${SMTP_PASSWORD}" - - "MAIL_FORM_ADDRESS=${MAIL_FROM_ADDRESS}" + - SMTP_HOST + - SMTP_SECURE + - SMTP_PORT + - SMTP_NAME + - SMTP_PASSWORD + - MAIL_FORM_ADDRESS depends_on: - db - redis diff --git a/pihole/docker-compose.yml b/pihole/docker-compose.yml index 9a5f255..1be45ff 100644 --- a/pihole/docker-compose.yml +++ b/pihole/docker-compose.yml @@ -5,11 +5,11 @@ services: image: pihole/pihole:latest network_mode: "host" environment: - - "TZ=${TZ}" - - "WEBPASSWORD=${WEBPASSWORD}" - - "ServerIP=${ServerIP}" - - "DNS1=${DNS1}" - - "DNS2=${DNS2}" + - TZ + - WEBPASSWORD + - ServerIP + - DNS1 + - DNS2 volumes: - ./etc-pihole:/etc/pihole/ - ./etc-dnsmasq.d:/etc/dnsmasq.d/ diff --git a/plex/docker-compose.yml b/plex/docker-compose.yml index 9f80fcb..5b1bacd 100644 --- a/plex/docker-compose.yml +++ b/plex/docker-compose.yml @@ -5,8 +5,8 @@ services: image: plexinc/pms-docker restart: unless-stopped environment: - - "TZ=${TZ}" - - "PLEX_CLAIM=${PLEX_CLAIM}" + - TZ + - PLEX_CLAIM network_mode: host volumes: - ./config:/config diff --git a/rainloop/docker-compose.yml b/rainloop/docker-compose.yml index 0438ea5..4db3483 100644 --- a/rainloop/docker-compose.yml +++ b/rainloop/docker-compose.yml @@ -32,7 +32,7 @@ services: volumes: - db:/var/lib/mysql environment: - - "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" - - "MYSQL_PASSWORD=${MYSQL_PASSWORD}" - - "MYSQL_DATABASE=${MYSQL_DATABASE}" - - "MYSQL_USER=${MYSQL_USER}" + - MYSQL_ROOT_PASSWORD + - MYSQL_PASSWORD + - MYSQL_DATABASE + - MYSQL_USER diff --git a/ttrss/docker-compose.yml b/ttrss/docker-compose.yml index c8c4ec7..8a77b4c 100644 --- a/ttrss/docker-compose.yml +++ b/ttrss/docker-compose.yml @@ -17,14 +17,14 @@ services: image: lunik1/tt-rss container_name: tt-rss environment: - - "PUID=${PUID}" - - "PGID=${PGID}" - - "TZ=${TZ}" - - "DB_TYPE=${DB_TYPE}" + - PUID + - PGID + - TZ + - DB_TYPE - "DB_USER=${MYSQL_USER}" - "DB_NAME=${MYSQL_DATABASE}" - "DB_PASS=${MYSQL_PASSWORD}" - - "DB_PORT=${DB_PORT}" + - DB_PORT - DB_HOST=db - "SELF_URL_PATH=https://${APP_DOMAIN}" volumes: @@ -47,7 +47,7 @@ services: volumes: - db:/var/lib/mysql environment: - - "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" - - "MYSQL_PASSWORD=${MYSQL_PASSWORD}" - - "MYSQL_DATABASE=${MYSQL_DATABASE}" - - "MYSQL_USER=${MYSQL_USER}" + - MYSQL_ROOT_PASSWORD + - MYSQL_PASSWORD + - MYSQL_DATABASE + - MYSQL_USER diff --git a/wallabag/docker-compose.yml b/wallabag/docker-compose.yml index 44006f3..8ff98a1 100644 --- a/wallabag/docker-compose.yml +++ b/wallabag/docker-compose.yml @@ -15,18 +15,18 @@ services: wallabag: image: wallabag/wallabag environment: - - "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" - - "SYMFONY__ENV__DATABASE_DRIVER=${SYMFONY__ENV__DATABASE_DRIVER}" + - MYSQL_ROOT_PASSWORD + - SYMFONY__ENV__DATABASE_DRIVER - SYMFONY__ENV__DATABASE_HOST=db - - "SYMFONY__ENV__DATABASE_PORT=${SYMFONY__ENV__DATABASE_PORT}" - - "SYMFONY__ENV__DATABASE_NAME=${SYMFONY__ENV__DATABASE_NAME}" - - "SYMFONY__ENV__DATABASE_USER=${SYMFONY__ENV__DATABASE_USER}" - - "SYMFONY__ENV__DATABASE_PASSWORD=${SYMFONY__ENV__DATABASE_PASSWORD}" + - SYMFONY__ENV__DATABASE_PORT + - SYMFONY__ENV__DATABASE_NAME + - SYMFONY__ENV__DATABASE_USER + - SYMFONY__ENV__DATABASE_PASSWORD - SYMFONY__ENV__DATABASE_CHARSET=utf8mb4 - - "SYMFONY__ENV__MAILER_HOST=${SYMFONY__ENV__MAILER_HOST}" - - "SYMFONY__ENV__MAILER_USER=${SYMFONY__ENV__MAILER_USER}" - - "SYMFONY__ENV__MAILER_PASSWORD=${SYMFONY__ENV__MAILER_PASSWORD}" - - "SYMFONY__ENV__FROM_EMAIL=${SYMFONY__ENV__FROM_EMAIL}" + - SYMFONY__ENV__MAILER_HOST + - SYMFONY__ENV__MAILER_USER + - SYMFONY__ENV__MAILER_PASSWORD + - SYMFONY__ENV__FROM_EMAIL - "SYMFONY__ENV__DOMAIN_NAME=https://${APP_DOMAIN}" volumes: - ./images:/var/www/wallabag/web/assets/images @@ -44,7 +44,7 @@ services: db: image: mariadb environment: - - "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" + - MYSQL_ROOT_PASSWORD volumes: - db:/var/lib/mysql restart: unless-stopped