Compare commits
No commits in common. "d923eb66281b848a286f5266efb92bc427689a8d" and "b474cc263030bea811fa1ede23bc431eef2b97cf" have entirely different histories.
d923eb6628
...
b474cc2630
5 changed files with 17 additions and 31 deletions
|
@ -6,7 +6,7 @@ services:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- freshrss
|
- freshrss
|
||||||
- postgres
|
- mariadb
|
||||||
- proxy
|
- proxy
|
||||||
ports:
|
ports:
|
||||||
- 8088:80
|
- 8088:80
|
||||||
|
@ -36,7 +36,7 @@ services:
|
||||||
networks:
|
networks:
|
||||||
freshrss:
|
freshrss:
|
||||||
external: false
|
external: false
|
||||||
postgres:
|
mariadb:
|
||||||
external: true
|
external: true
|
||||||
proxy:
|
proxy:
|
||||||
external: true
|
external: true
|
||||||
|
|
|
@ -8,9 +8,14 @@ services:
|
||||||
- TZ=Europe/Helsinki
|
- TZ=Europe/Helsinki
|
||||||
- USER_UID=1000
|
- USER_UID=1000
|
||||||
- USER_GID=1000
|
- USER_GID=1000
|
||||||
|
- DB_TYPE=mysql
|
||||||
|
- DB_HOST=mariadb:3306
|
||||||
|
- DB_NAME=gitea
|
||||||
|
- DB_USER=gitea
|
||||||
|
- DB_PASSWD=${MYSQL_PASS}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- postgres
|
- mariadb
|
||||||
- proxy
|
- proxy
|
||||||
ports:
|
ports:
|
||||||
- "3000:3000"
|
- "3000:3000"
|
||||||
|
@ -35,7 +40,7 @@ services:
|
||||||
- "traefik.http.services.gitea.loadbalancer.server.port=3000"
|
- "traefik.http.services.gitea.loadbalancer.server.port=3000"
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
postgres:
|
mariadb:
|
||||||
external: true
|
external: true
|
||||||
proxy:
|
proxy:
|
||||||
external: true
|
external: true
|
||||||
|
|
|
@ -13,7 +13,7 @@ services:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- homeautomation
|
- homeautomation
|
||||||
- postgres
|
- mariadb
|
||||||
- proxy
|
- proxy
|
||||||
ports:
|
ports:
|
||||||
- "8123:8123"
|
- "8123:8123"
|
||||||
|
@ -133,11 +133,11 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- /docker/homeautomation/gotify:/app/data
|
- /docker/homeautomation/gotify:/app/data
|
||||||
environment:
|
environment:
|
||||||
- GOTIFY_DATABASE_DIALECT=postgres
|
- GOTIFY_DATABASE_DIALECT=mysql
|
||||||
- GOTIFY_DATABASE_CONNECTION="host=postgres port=5432 user=gotify dbname=gotify password=${GOTIFY_PGPASS} sslmode=disable"
|
- GOTIFY_DATABASE_CONNECTION=gotify:gotify@tcp(mariadb:3306)/gotify?charset=utf8&parseTime=True&loc=Local
|
||||||
networks:
|
networks:
|
||||||
- proxy
|
- proxy
|
||||||
- postgres
|
- mariadb
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
|
@ -158,7 +158,7 @@ services:
|
||||||
networks:
|
networks:
|
||||||
homeautomation:
|
homeautomation:
|
||||||
external: false
|
external: false
|
||||||
postgres:
|
mariadb:
|
||||||
external: true
|
external: true
|
||||||
proxy:
|
proxy:
|
||||||
external: true
|
external: true
|
||||||
|
|
|
@ -9,7 +9,7 @@ services:
|
||||||
- "1869:80"
|
- "1869:80"
|
||||||
networks:
|
networks:
|
||||||
- nextcloud
|
- nextcloud
|
||||||
- postgres
|
- mariadb
|
||||||
- proxy
|
- proxy
|
||||||
volumes:
|
volumes:
|
||||||
- /docker/nextcloud:/var/www/html
|
- /docker/nextcloud:/var/www/html
|
||||||
|
@ -19,6 +19,7 @@ services:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
environment:
|
environment:
|
||||||
- TZ=Europe/Helsinki
|
- TZ=Europe/Helsinki
|
||||||
|
- MYSQL_HOST=mariadb-nextcloud
|
||||||
- REDIS_HOST=redis
|
- REDIS_HOST=redis
|
||||||
- REDIS_HOST_PASSWORD=123
|
- REDIS_HOST_PASSWORD=123
|
||||||
depends_on:
|
depends_on:
|
||||||
|
@ -60,7 +61,7 @@ services:
|
||||||
networks:
|
networks:
|
||||||
nextcloud:
|
nextcloud:
|
||||||
external: false
|
external: false
|
||||||
postgres:
|
mariadb:
|
||||||
external: true
|
external: true
|
||||||
proxy:
|
proxy:
|
||||||
external: true
|
external: true
|
||||||
|
|
|
@ -1,20 +0,0 @@
|
||||||
version: "3"
|
|
||||||
services:
|
|
||||||
postgres:
|
|
||||||
container_name: postgres
|
|
||||||
image: postgres:13
|
|
||||||
environment:
|
|
||||||
- TZ=Europe/Helsinki
|
|
||||||
- POSTGRES_PASSWORD=12345
|
|
||||||
ports:
|
|
||||||
- 5432:5432
|
|
||||||
networks:
|
|
||||||
- postgres
|
|
||||||
volumes:
|
|
||||||
- /docker/postgres:/var/lib/postgresql/data
|
|
||||||
- /etc/localtime:/etc/localtime:ro
|
|
||||||
restart: unless-stopped
|
|
||||||
|
|
||||||
networks:
|
|
||||||
postgres:
|
|
||||||
external: true
|
|
Loading…
Reference in a new issue