Gurulandia/Homelab
1
0
Fork 0
Code Pull Requests Actions Wiki Activity

edited

Browse Source
This commit is contained in:
Gurulandia
2025-02-09 19:21:02 +02:00
parent 60d7915697
commit 394ce1cbd4
6 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docker/joplin-server/behind-proxy-with-db/compose.override.yaml
View File

@@ -13,13 +13,15 @@ services:
- "traefik.http.services.${JOPLIN_HOSTNAME}-svc.loadbalancer.server.port=22300" - "traefik.http.services.${JOPLIN_HOSTNAME}-svc.loadbalancer.server.port=22300"
depends_on: depends_on:
- db - db
networks:
- ${JOPLINDB_NETWORk_ID}
env_file: env_file:
- path: ../../env/.env.joplin-srv.withdb - path: ../../env/joplin-srv-withdb.env
db: db:
image: ${JOPLINDB_IMAGE}:${JOPLINDB_TAG} image: ${JOPLINDB_IMAGE}:${JOPLINDB_TAG}
container_name: ${JOPLINDB_CONTAINER_NAME} container_name: ${JOPLINDB_CONTAINER_NAME}
restart: ${JOPLINDB_RESTART_POLICY} restart: ${JOPLINDB_RESTART_POLICY}
env_file: env_file:
- path: ../../env/.env.joplin-srv.db-cred - path: ../../env/joplin-srv-db-cred.env
networks: networks:
- ${JOPLIN_NETWORk_ID} - ${JOPLINDB_NETWORk_ID}

5
docker/joplin-server/behind-proxy-with-db/compose.yaml
View File

@@ -1,8 +1,9 @@
name: joplinserver
# Docker Compose v2.20 or greater required to use "include" # Docker Compose v2.20 or greater required to use "include"
include: include:
#################### NETWORKS #################### #################### NETWORKS ####################
- ../../compose/networks/proxy.yaml - ../../compose/networks/${JOPLIN_NETWORk_ID}.yaml
- ../../compose/networks/socket-proxy.yaml - ../../compose/networks/${JOPLINDB_NETWORk_ID}.yaml
#################### SERVICES #################### #################### SERVICES ####################
- ../../compose/postgres.yaml - ../../compose/postgres.yaml
- ../../compose/joplin-server.yaml - ../../compose/joplin-server.yaml

4
docker/joplin-server/behind-proxy/compose.yaml
View File

@@ -1,7 +1,7 @@
name: joplinserver
# Docker Compose v2.20 or greater required to use "include" # Docker Compose v2.20 or greater required to use "include"
include: include:
#################### NETWORKS #################### #################### NETWORKS ####################
- ../../compose/networks/proxy.yaml - ../../compose/networks/${JOPLIN_NETWORk_ID}.yaml
- ../../compose/networks/socket-proxy.yaml
#################### SERVICES #################### #################### SERVICES ####################
- ../../compose/joplin-server.yaml - ../../compose/joplin-server.yaml

4
docker/joplin-server/compose.yaml
View File

@@ -1,7 +1,7 @@
name: joplinserver
# Docker Compose v2.20 or greater required to use "include" # Docker Compose v2.20 or greater required to use "include"
include: include:
#################### NETWORKS #################### #################### NETWORKS ####################
- ../../compose/networks/proxy.yaml - ../../compose/networks/${JOPLIN_NETWORk_ID}.yaml
- ../../compose/networks/socket-proxy.yaml
#################### SERVICES #################### #################### SERVICES ####################
- ../../compose/joplin-server.yaml - ../../compose/joplin-server.yaml

8
docker/joplin-server/with-db/compose.override.yaml
View File

@@ -5,14 +5,16 @@ services:
# ports: # ports:
# - "22300:22300" # - "22300:22300"
env_file: env_file:
- path: ../../env/.env.joplin-srv.withdb - path: ../../env/joplin-srv-withdb.env
networks:
- ${JOPLINDB_NETWORk_ID}
db: db:
image: ${JOPLINDB_IMAGE}:${JOPLINDB_TAG} image: ${JOPLINDB_IMAGE}:${JOPLINDB_TAG}
container_name: ${JOPLINDB_CONTAINER_NAME} container_name: ${JOPLINDB_CONTAINER_NAME}
restart: ${JOPLINDB_RESTART_POLICY} restart: ${JOPLINDB_RESTART_POLICY}
env_file: env_file:
- path: ../../env/.env.joplin-srv.db-cred - path: ../../env/joplin-srv-db-cred.env
# ports: # ports:
# - "5432:5432" # - "5432:5432"
networks: networks:
- ${JOPLIN_NETWORk_ID} - ${JOPLINDB_NETWORk_ID}

4
docker/joplin-server/with-db/compose.yaml
View File

@@ -1,8 +1,8 @@
# Docker Compose v2.20 or greater required to use "include" # Docker Compose v2.20 or greater required to use "include"
include: include:
#################### NETWORKS #################### #################### NETWORKS ####################
- ../../compose/networks/proxy.yaml - ../../compose/networks/${JOPLIN_NETWORk_ID}.yaml
- ../../compose/networks/socket-proxy.yaml - ../../compose/networks/${JOPLINDB_NETWORk_ID}.yaml
#################### SERVICES #################### #################### SERVICES ####################
- ../../compose/postgres.yaml - ../../compose/postgres.yaml
- ../../compose/joplin-server.yaml - ../../compose/joplin-server.yaml