Added unless-stopped to all relevant services, added versioning for element and mautrix-whatsapp

This commit is contained in:
Mathias Teier 2021-04-02 09:53:52 +02:00
parent 99cd550cd9
commit c20692e73c
No known key found for this signature in database
GPG Key ID: 8CE851A755C27766
11 changed files with 31 additions and 22 deletions

View File

@ -1,9 +1,9 @@
version: '2.4' version: '2.4'
services: services:
mariadb: element:
image: vectorim/element-web image: vectorim/element-web:v1.7.23
restart: unless-stopped
volumes: volumes:
- ./config.json:/app/config.json - ./config.json:/app/config.json
ports: ports:
- 8083:80 - 8083:80

View File

@ -20,4 +20,4 @@ networks:
driver: bridge driver: bridge
postgres_net: postgres_net:
name: postgres_net name: postgres_net
external: true external: true

View File

@ -11,6 +11,4 @@ services:
networks: networks:
matrix_net: matrix_net:
name: matrix_net name: matrix_net
driver: bridge driver: bridge

View File

@ -1,7 +1,7 @@
version: '2.4' version: '2.4'
services: services:
mautrix-whatsapp: mautrix-whatsapp:
image: dock.mau.dev/tulir/mautrix-whatsapp:latest image: dock.mau.dev/tulir/mautrix-whatsapp:v0.1.5
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- /var/mautrix-whatsapp:/data - /var/mautrix-whatsapp:/data
@ -11,5 +11,4 @@ services:
networks: networks:
matrix_net: matrix_net:
name: matrix_net name: matrix_net
driver: bridge driver: bridge

View File

@ -3,7 +3,7 @@ services:
minecraft: minecraft:
build: build:
context: . context: .
restart: always restart: unless-stopped
volumes: volumes:
- /var/minecraft/world:/minecraft/world - /var/minecraft/world:/minecraft/world
- /var/minecraft/ops.json:/minecraft/ops.json - /var/minecraft/ops.json:/minecraft/ops.json
@ -19,4 +19,4 @@ services:
MAX_PLAYERS: "20" MAX_PLAYERS: "20"
ENABLED_WHITELIST: "true" ENABLED_WHITELIST: "true"
ports: ports:
- 25565:25565 - 25565:25565

0
minecraft/docker-entrypoint.sh Executable file → Normal file
View File

View File

@ -1,7 +1,15 @@
version: '2.4' version: '2.4'
services: services:
redis:
image: redis:6.2.0
restart: unless-stopped
volumes:
- /var/redis:/data
networks:
- "nextcloud_net"
nextcloud: nextcloud:
image: nextcloud:fpm build: ./nextcloud-fpm
restart: unless-stopped
environment: environment:
POSTGRES_DB: nextcloud POSTGRES_DB: nextcloud
POSTGRES_USER: nextcloud POSTGRES_USER: nextcloud
@ -13,14 +21,17 @@ services:
OVERWRITEPROTOCOL: "https" OVERWRITEPROTOCOL: "https"
OVERWRITEWEBROOT: "/" OVERWRITEWEBROOT: "/"
OVERWRITECONADDR: "138.201.74.231" OVERWRITECONADDR: "138.201.74.231"
REDIS_HOST: redis
networks: networks:
- "postgres_net" - "postgres_net"
- "nextcloud_net" - "nextcloud_net"
volumes: volumes:
- /var/nextcloud:/var/www/html - /var/nextcloud:/var/www/html
- /mnt/mathias:/mnt/mathias
- /mnt/public:/mnt/public
web: web:
image: nginx image: nginx
restart: always restart: unless-stopped
ports: ports:
- 8081:80 - 8081:80
networks: networks:
@ -35,4 +46,4 @@ networks:
driver: bridge driver: bridge
postgres_net: postgres_net:
name: "postgres_net" name: "postgres_net"
external: true external: true

View File

@ -2,6 +2,7 @@ version: '2.4'
services: services:
nummus: nummus:
image: glenroy37/nummus:0.1.2-alpha image: glenroy37/nummus:0.1.2-alpha
restart: unless-stopped
environment: environment:
DB_HOST: postgres DB_HOST: postgres
DB_USER: nummus DB_USER: nummus
@ -17,4 +18,4 @@ services:
networks: networks:
mariadb_net: mariadb_net:
name: "postgres_net" name: "postgres_net"
external: true external: true

View File

@ -2,6 +2,7 @@ version: '2.4'
services: services:
postgres: postgres:
image: postgres:13.1-alpine image: postgres:13.1-alpine
restart: unless-stopped
environment: environment:
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
PGDATA: /var/lib/postgresql/data/pgdata PGDATA: /var/lib/postgresql/data/pgdata
@ -14,4 +15,4 @@ services:
networks: networks:
postgres_net: postgres_net:
name: postgres_net name: postgres_net
driver: bridge driver: bridge

View File

@ -1,8 +1,8 @@
version: '2.4' version: '2.4'
services: services:
synapse: synapse:
image: matrixdotorg/synapse:v1.26.0-deb image: matrixdotorg/synapse:v1.28.0
restart: always restart: unless-stopped
healthcheck: healthcheck:
test: ["CMD", "curl", "-fSs", "http://localhost:8008/health"] test: ["CMD", "curl", "-fSs", "http://localhost:8008/health"]
interval: 1m interval: 1m
@ -27,4 +27,4 @@ networks:
driver: bridge driver: bridge
postgres_net: postgres_net:
name: postgres_net name: postgres_net
external: true external: true

View File

@ -67,4 +67,3 @@
community.general.ufw: community.general.ufw:
state: enabled state: enabled
policy: deny policy: deny