diff --git a/docker/joplin-server/behind-proxy-with-db/compose.override.yaml b/docker/joplin-server/behind-proxy-with-db/compose.override.yaml index 817f42b..1bcd162 100644 --- a/docker/joplin-server/behind-proxy-with-db/compose.override.yaml +++ b/docker/joplin-server/behind-proxy-with-db/compose.override.yaml @@ -1,25 +1,25 @@ services: - joplin-server: - labels: - - "traefik.enable=true" - ## HTTP Routers - - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.entrypoints=https" - - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.rule=Host(`${JOPLIN_HOSTNAME}.$DOMAINNAME1`)" - ## Middlewares + joplin-server: + labels: + - "traefik.enable=true" + ## HTTP Routers + - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.entrypoints=https" + - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.rule=Host(`${JOPLIN_HOSTNAME}.$DOMAINNAME1`)" + ## Middlewares # - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.middlewares=chain-authelia@file" - - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.middlewares=chain-no-auth@file" - ## HTTP Services - - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.service=${JOPLIN_HOSTNAME}-svc" - - "traefik.http.services.${JOPLIN_HOSTNAME}-svc.loadbalancer.server.port=22300" - depends_on: - - db - env_file: - - path: ../../env/.env.joplin-srv.withdb - db: - image: ${JOPLINDB_IMAGE}:${JOPLINDB_TAG} - container_name: ${JOPLINDB_CONTAINER_NAME} - restart: ${JOPLINDB_RESTART_POLICY} - env_file: - - path: ../../env/.env.joplin-srv.db-cred - networks: - - ${JOPLIN_NETWORk_ID} \ No newline at end of file + - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.middlewares=chain-no-auth@file" + ## HTTP Services + - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.service=${JOPLIN_HOSTNAME}-svc" + - "traefik.http.services.${JOPLIN_HOSTNAME}-svc.loadbalancer.server.port=22300" + depends_on: + - db + env_file: + - path: ../../env/.env.joplin-srv.withdb + db: + image: ${JOPLINDB_IMAGE}:${JOPLINDB_TAG} + container_name: ${JOPLINDB_CONTAINER_NAME} + restart: ${JOPLINDB_RESTART_POLICY} + env_file: + - path: ../../env/.env.joplin-srv.db-cred + networks: + - ${JOPLIN_NETWORk_ID} \ No newline at end of file diff --git a/docker/joplin-server/behind-proxy/compose.override.yaml b/docker/joplin-server/behind-proxy/compose.override.yaml index 60e2ef2..a8c9092 100644 --- a/docker/joplin-server/behind-proxy/compose.override.yaml +++ b/docker/joplin-server/behind-proxy/compose.override.yaml @@ -1,13 +1,14 @@ services: - joplin-server: - labels: - - "traefik.enable=true" - ## HTTP Routers - - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.entrypoints=https" - - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.rule=Host(`${JOPLIN_HOSTNAME}.$DOMAINNAME1`)" - ## Middlewares + joplin-server: + labels: + - "traefik.enable=true" + ## HTTP Routers + - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.entrypoints=https" + - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.rule=Host(`${JOPLIN_HOSTNAME}.$DOMAINNAME1`)" + ## Middlewares # - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.middlewares=chain-authelia@file" - - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.middlewares=chain-no-auth@file" - ## HTTP Services - - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.service=${JOPLIN_HOSTNAME}-svc" - - "traefik.http.services.${JOPLIN_HOSTNAME}-svc.loadbalancer.server.port=22300" + - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.middlewares=chain-no-auth@file" + ## HTTP Services + - "traefik.http.routers.${JOPLIN_HOSTNAME}-rtr.service=${JOPLIN_HOSTNAME}-svc" + - "traefik.http.services.${JOPLIN_HOSTNAME}-svc.loadbalancer.server.port=22300" + diff --git a/docker/joplin-server/with-db/compose.override.yaml b/docker/joplin-server/with-db/compose.override.yaml index a5054db..e9bec3f 100644 --- a/docker/joplin-server/with-db/compose.override.yaml +++ b/docker/joplin-server/with-db/compose.override.yaml @@ -1,18 +1,18 @@ services: - joplin-server: - depends_on: - - db -# ports: -# - "22300:22300" - env_file: - - path: ../../env/.env.joplin-srv.withdb - db: - image: ${JOPLINDB_IMAGE}:${JOPLINDB_TAG} - container_name: ${JOPLINDB_CONTAINER_NAME} - restart: ${JOPLINDB_RESTART_POLICY} - env_file: - - path: ../../env/.env.joplin-srv.db-cred -# ports: -# - "5432:5432" - networks: - - ${JOPLIN_NETWORk_ID} \ No newline at end of file + joplin-server: + depends_on: + - db +# ports: +# - "22300:22300" + env_file: + - path: ../../env/.env.joplin-srv.withdb + db: + image: ${JOPLINDB_IMAGE}:${JOPLINDB_TAG} + container_name: ${JOPLINDB_CONTAINER_NAME} + restart: ${JOPLINDB_RESTART_POLICY} + env_file: + - path: ../../env/.env.joplin-srv.db-cred +# ports: +# - "5432:5432" + networks: + - ${JOPLIN_NETWORk_ID} \ No newline at end of file