Nebucatnetzer
/
docker_systems
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Andreas Zweili 2020-04-14 21:16:39 +02:00
parent 4090821b82
commit 32e559a833
10 changed files with 75 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bookstack/docker-compose.yml
View File

@ -8,14 +8,14 @@
image: linuxserver/bookstack image: linuxserver/bookstack
container_name: bookstack container_name: bookstack
environment: environment:
- "PUID=${PUID}" - PUID
- "PGID=${PGID}" - PGID
- "TZ=${TZ}" - TZ
- "DB_HOST=${DB_HOST}" - DB_HOST
- "DB_USER=${MYSQL_USER}" - "DB_USER=${MYSQL_USER}"
- "DB_PASS=${MYSQL_PASSWORD}" - "DB_PASS=${MYSQL_PASSWORD}"
- "DB_DATABASE=${MYSQL_DATABASE}" - "DB_DATABASE=${MYSQL_DATABASE}"
- "APP_URL=${APP_URL}" - APP_URL
volumes: volumes:
- ./config:/config - ./config:/config
depends_on: depends_on:
@ -30,10 +30,10 @@
db: db:
image: mariadb:10.3 image: mariadb:10.3
environment: environment:
- "MYSQL_RANDOM_ROOT_PASSWORD=${MYSQL_RANDOM_ROOT_PASSWORD}" - MYSQL_RANDOM_ROOT_PASSWORD
- "MYSQL_DATABASE=${MYSQL_DATABASE}" - MYSQL_DATABASE
- "MYSQL_USER=${MYSQL_USER}" - MYSQL_USER
- "MYSQL_PASSWORD=${MYSQL_PASSWORD}" - MYSQL_PASSWORD
volumes: volumes:
- db:/var/lib/mysql - db:/var/lib/mysql
restart: unless-stopped restart: unless-stopped

14
docker-mailserver/docker-compose.yml
View File

@ -32,13 +32,13 @@ services:
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN
environment: environment:
- "PUID=${PUID}" - PUID
- "PGID=${PGID}" - PGID
- "TZ=${TZ}" - TZ
- "URL=${URL}" - URL
- "VALIDATION=${VALIDATION}" - VALIDATION
- "EMAIL=${EMAIL}" - EMAIL
- "DHLEVEL=${DHLEVEL}" - DHLEVEL
volumes: volumes:
- ./letsencrypt:/config - ./letsencrypt:/config
ports: ports:

18
gitea/docker-compose.yml
View File

@ -16,17 +16,17 @@ services:
gitea: gitea:
image: gitea/gitea:1 image: gitea/gitea:1
environment: environment:
- "USER_UID=${USER_UID}" - USER_UID
- "USER_GID=${USER_GID}" - USER_GID
- "DB_TYPE=${DB_TYPE}" - DB_TYPE
- "DB_HOST=db:${DB_PORT}" - "DB_HOST=db:${DB_PORT}"
- "DB_NAME=${MYSQL_DATABASE}" - "DB_NAME=${MYSQL_DATABASE}"
- "DB_USER=${MYSQL_USER}" - "DB_USER=${MYSQL_USER}"
- "DB_PASSWD=${MYSQL_PASSWORD}" - "DB_PASSWD=${MYSQL_PASSWORD}"
- "ROOT_URL=${APP_DOMAIN}" - "ROOT_URL=${APP_DOMAIN}"
- INSTALL_LOCK=true - INSTALL_LOCK=true
- "SECRET_KEY=${SECRET_KEY}" - SECRET_KEY
- "DISABLE_REGISTRATION=${DISABLE_REGISTRATION}" - DISABLE_REGISTRATION
volumes: volumes:
- ./data:/data - ./data:/data
- /etc/timezone:/etc/timezone:ro - /etc/timezone:/etc/timezone:ro
@ -50,8 +50,8 @@ services:
volumes: volumes:
- db:/var/lib/mysql - db:/var/lib/mysql
environment: environment:
- "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" - MYSQL_ROOT_PASSWORD
- "MYSQL_PASSWORD=${MYSQL_PASSWORD}" - MYSQL_PASSWORD
- "MYSQL_DATABASE=${MYSQL_DATABASE}" - MYSQL_DATABASE
- "MYSQL_USER=${MYSQL_USER}" - MYSQL_USER
restart: unless-stopped restart: unless-stopped

6
librenms/docker-compose.yml
View File

@ -14,7 +14,11 @@ services:
volumes: volumes:
- "./db:/var/lib/mysql" - "./db:/var/lib/mysql"
environment: environment:
- MYSQL_ALLOW_EMPTY_PASSWORD="yes" - TZ
- "MYSQL_ALLOW_EMPTY_PASSWORD=yes"
- MYSQL_DATABASE
- MYSQL_USER
- MYSQL_PASSWORD
restart: always restart: always
memcached: memcached:

28
nextcloud/docker-compose.yml
View File

@ -20,9 +20,9 @@ services:
- db:/var/lib/mysql - db:/var/lib/mysql
environment: environment:
- MYSQL_RANDOM_ROOT_PASSWORD=yes - MYSQL_RANDOM_ROOT_PASSWORD=yes
- "MYSQL_PASSWORD=${MYSQL_PASSWORD}" - MYSQL_PASSWORD
- "MYSQL_DATABASE=${MYSQL_DATABASE}" - MYSQL_DATABASE
- "MYSQL_USER=${MYSQL_USER}" - MYSQL_USER
redis: redis:
image: redis:alpine image: redis:alpine
@ -31,20 +31,20 @@ services:
app: app:
build: ./nextcloud build: ./nextcloud
environment: environment:
- "MYSQL_PASSWORD=${MYSQL_PASSWORD}" - MYSQL_PASSWORD
- "MYSQL_DATABASE=${MYSQL_DATABASE}" - MYSQL_DATABASE
- "MYSQL_USER=${MYSQL_USER}" - MYSQL_USER
- MYSQL_HOST=db - MYSQL_HOST=db
- "NEXTCLOUD_ADMIN_USER=${NEXTCLOUD_ADMIN_USER}" - NEXTCLOUD_ADMIN_USER
- "NEXTCLOUD_ADMIN_PASSWORD=${NEXTCLOUD_ADMIN_PASSWORD}" - NEXTCLOUD_ADMIN_PASSWORD
- "NEXTCLOUD_TRUSTED_DOMAINS=${APP_DOMAIN} ${NEXTCLOUD_TRUSTED_DOMAINS}" - "NEXTCLOUD_TRUSTED_DOMAINS=${APP_DOMAIN} ${NEXTCLOUD_TRUSTED_DOMAINS}"
- REDIS_HOST=redis - REDIS_HOST=redis
- "SMTP_HOST=${SMTP_HOST}" - SMTP_HOST
- "SMTP_SECURE=${SMTP_SECURE}" - SMTP_SECURE
- "SMTP_PORT=${SMTP_PORT}" - SMTP_PORT
- "SMTP_NAME=${SMTP_NAME}" - SMTP_NAME
- "SMTP_PASSWORD=${SMTP_PASSWORD}" - SMTP_PASSWORD
- "MAIL_FORM_ADDRESS=${MAIL_FROM_ADDRESS}" - MAIL_FORM_ADDRESS
depends_on: depends_on:
- db - db
- redis - redis

10
pihole/docker-compose.yml
View File

@ -5,11 +5,11 @@ services:
image: pihole/pihole:latest image: pihole/pihole:latest
network_mode: "host" network_mode: "host"
environment: environment:
- "TZ=${TZ}" - TZ
- "WEBPASSWORD=${WEBPASSWORD}" - WEBPASSWORD
- "ServerIP=${ServerIP}" - ServerIP
- "DNS1=${DNS1}" - DNS1
- "DNS2=${DNS2}" - DNS2
volumes: volumes:
- ./etc-pihole:/etc/pihole/ - ./etc-pihole:/etc/pihole/
- ./etc-dnsmasq.d:/etc/dnsmasq.d/ - ./etc-dnsmasq.d:/etc/dnsmasq.d/

4
plex/docker-compose.yml
View File

@ -5,8 +5,8 @@ services:
image: plexinc/pms-docker image: plexinc/pms-docker
restart: unless-stopped restart: unless-stopped
environment: environment:
- "TZ=${TZ}" - TZ
- "PLEX_CLAIM=${PLEX_CLAIM}" - PLEX_CLAIM
network_mode: host network_mode: host
volumes: volumes:
- ./config:/config - ./config:/config

8
rainloop/docker-compose.yml
View File

@ -32,7 +32,7 @@ services:
volumes: volumes:
- db:/var/lib/mysql - db:/var/lib/mysql
environment: environment:
- "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" - MYSQL_ROOT_PASSWORD
- "MYSQL_PASSWORD=${MYSQL_PASSWORD}" - MYSQL_PASSWORD
- "MYSQL_DATABASE=${MYSQL_DATABASE}" - MYSQL_DATABASE
- "MYSQL_USER=${MYSQL_USER}" - MYSQL_USER

18
ttrss/docker-compose.yml
View File

@ -17,14 +17,14 @@ services:
image: lunik1/tt-rss image: lunik1/tt-rss
container_name: tt-rss container_name: tt-rss
environment: environment:
- "PUID=${PUID}" - PUID
- "PGID=${PGID}" - PGID
- "TZ=${TZ}" - TZ
- "DB_TYPE=${DB_TYPE}" - DB_TYPE
- "DB_USER=${MYSQL_USER}" - "DB_USER=${MYSQL_USER}"
- "DB_NAME=${MYSQL_DATABASE}" - "DB_NAME=${MYSQL_DATABASE}"
- "DB_PASS=${MYSQL_PASSWORD}" - "DB_PASS=${MYSQL_PASSWORD}"
- "DB_PORT=${DB_PORT}" - DB_PORT
- DB_HOST=db - DB_HOST=db
- "SELF_URL_PATH=https://${APP_DOMAIN}" - "SELF_URL_PATH=https://${APP_DOMAIN}"
volumes: volumes:
@ -47,7 +47,7 @@ services:
volumes: volumes:
- db:/var/lib/mysql - db:/var/lib/mysql
environment: environment:
- "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" - MYSQL_ROOT_PASSWORD
- "MYSQL_PASSWORD=${MYSQL_PASSWORD}" - MYSQL_PASSWORD
- "MYSQL_DATABASE=${MYSQL_DATABASE}" - MYSQL_DATABASE
- "MYSQL_USER=${MYSQL_USER}" - MYSQL_USER

22
wallabag/docker-compose.yml
View File

@ -15,18 +15,18 @@ services:
wallabag: wallabag:
image: wallabag/wallabag image: wallabag/wallabag
environment: environment:
- "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" - MYSQL_ROOT_PASSWORD
- "SYMFONY__ENV__DATABASE_DRIVER=${SYMFONY__ENV__DATABASE_DRIVER}" - SYMFONY__ENV__DATABASE_DRIVER
- SYMFONY__ENV__DATABASE_HOST=db - SYMFONY__ENV__DATABASE_HOST=db
- "SYMFONY__ENV__DATABASE_PORT=${SYMFONY__ENV__DATABASE_PORT}" - SYMFONY__ENV__DATABASE_PORT
- "SYMFONY__ENV__DATABASE_NAME=${SYMFONY__ENV__DATABASE_NAME}" - SYMFONY__ENV__DATABASE_NAME
- "SYMFONY__ENV__DATABASE_USER=${SYMFONY__ENV__DATABASE_USER}" - SYMFONY__ENV__DATABASE_USER
- "SYMFONY__ENV__DATABASE_PASSWORD=${SYMFONY__ENV__DATABASE_PASSWORD}" - SYMFONY__ENV__DATABASE_PASSWORD
- SYMFONY__ENV__DATABASE_CHARSET=utf8mb4 - SYMFONY__ENV__DATABASE_CHARSET=utf8mb4
- "SYMFONY__ENV__MAILER_HOST=${SYMFONY__ENV__MAILER_HOST}" - SYMFONY__ENV__MAILER_HOST
- "SYMFONY__ENV__MAILER_USER=${SYMFONY__ENV__MAILER_USER}" - SYMFONY__ENV__MAILER_USER
- "SYMFONY__ENV__MAILER_PASSWORD=${SYMFONY__ENV__MAILER_PASSWORD}" - SYMFONY__ENV__MAILER_PASSWORD
- "SYMFONY__ENV__FROM_EMAIL=${SYMFONY__ENV__FROM_EMAIL}" - SYMFONY__ENV__FROM_EMAIL
- "SYMFONY__ENV__DOMAIN_NAME=https://${APP_DOMAIN}" - "SYMFONY__ENV__DOMAIN_NAME=https://${APP_DOMAIN}"
volumes: volumes:
- ./images:/var/www/wallabag/web/assets/images - ./images:/var/www/wallabag/web/assets/images
@ -44,7 +44,7 @@ services:
db: db:
image: mariadb image: mariadb
environment: environment:
- "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" - MYSQL_ROOT_PASSWORD
volumes: volumes:
- db:/var/lib/mysql - db:/var/lib/mysql
restart: unless-stopped restart: unless-stopped