diff --git a/docker/YeetFile/behind-proxy-with-db/compose.override.yml b/docker/YeetFile/behind-proxy-with-db/compose.override.yml index 42eeaaf..0b715f2 100644 --- a/docker/YeetFile/behind-proxy-with-db/compose.override.yml +++ b/docker/YeetFile/behind-proxy-with-db/compose.override.yml @@ -14,6 +14,8 @@ services: ## HTTP Services - "traefik.http.routers.${YEETFILE_HOSTNAME}-rtr.service=${YEETFILE_HOSTNAME}-svc" - "traefik.http.services.${YEETFILE_HOSTNAME}-svc.loadbalancer.server.port=8090" + networks: + - ${YEETFILEDB_NETWORk_ID} depends_on: db: condition: service_healthy @@ -31,5 +33,5 @@ services: healthcheck: test: [ "CMD-SHELL", "pg_isready -U postgres" ] interval: 3s - networks: - - ${YEETFILE_NETWORk_ID} \ No newline at end of file + networks: + - ${YEETFILEDB_NETWORk_ID} \ No newline at end of file diff --git a/docker/YeetFile/behind-proxy-with-db/compose.yml b/docker/YeetFile/behind-proxy-with-db/compose.yml index 646e8c0..ea00631 100644 --- a/docker/YeetFile/behind-proxy-with-db/compose.yml +++ b/docker/YeetFile/behind-proxy-with-db/compose.yml @@ -1,8 +1,9 @@ +name: yeetfile # Docker Compose v2.20 or greater required to use "include" include: #################### NETWORKS #################### - - ../../compose/networks/proxy.yaml - - ../../compose/networks/socket-proxy.yaml + - ../../compose/networks/${YEETFILE_NETWORk_ID}.yaml + - ../../compose/networks/${YEETFILEDB_NETWORk_ID}.yaml #################### SERVICES #################### - ../../compose/postgres.yaml - ../../compose/yeetfile.yaml diff --git a/docker/YeetFile/behind-proxy-with-db/dcc.sh b/docker/YeetFile/behind-proxy-with-db/dcc.sh index 34d1ad0..9bdd354 100755 --- a/docker/YeetFile/behind-proxy-with-db/dcc.sh +++ b/docker/YeetFile/behind-proxy-with-db/dcc.sh @@ -1 +1,6 @@ -docker compose --env-file ../../env/.env.stack.yeetfile --env-file ../../env/.env.yeetfile --env-file ../../env/.env.common config \ No newline at end of file +#docker create network -d brigde proxy +#docker create network -d bridge backend +docker compose --env-file ../../env/YeetFile-stack.env \ +--env-file ../../env/YeetFile-db.env \ +--env-file ../../env/YeetFile.env \ +--env-file ../../env/common.env config diff --git a/docker/YeetFile/behind-proxy/compose.override.yml b/docker/YeetFile/behind-proxy/compose.override.yml index b3a0e77..8652cee 100644 --- a/docker/YeetFile/behind-proxy/compose.override.yml +++ b/docker/YeetFile/behind-proxy/compose.override.yml @@ -8,7 +8,7 @@ services: - "traefik.http.routers.${YEETFILE_HOSTNAME}-rtr.entrypoints=https" - "traefik.http.routers.${YEETFILE_HOSTNAME}-rtr.rule=Host(`${YEETFILE_HOSTNAME}.$DOMAINNAME1`)" ## Middlewares -# - "traefik.http.routers.${YEETFILE_HOSTNAME}-rtr.middlewares=chain-authelia@file" +# - "traefik.http.routers.${YEETFILE_HOSTNAME}-rtr.middlewares=chain-authentik@file" - "traefik.http.routers.${YEETFILE_HOSTNAME}-rtr.middlewares=chain-no-auth@file" ## HTTP Services - "traefik.http.routers.${YEETFILE_HOSTNAME}-rtr.service=${YEETFILE_HOSTNAME}-svc" diff --git a/docker/YeetFile/behind-proxy/compose.yml b/docker/YeetFile/behind-proxy/compose.yml index 50d5ca2..9bbbd7d 100644 --- a/docker/YeetFile/behind-proxy/compose.yml +++ b/docker/YeetFile/behind-proxy/compose.yml @@ -1,7 +1,7 @@ +name: yeetfile # Docker Compose v2.20 or greater required to use "include" include: #################### NETWORKS #################### - - ../../compose/networks/proxy.yaml - - ../../compose/networks/socket-proxy.yaml + - ../../compose/networks/${YEETFILE_NETWORk_ID}.yaml #################### SERVICES #################### - ../../compose/yeetfile.yaml diff --git a/docker/YeetFile/behind-proxy/dcc.sh b/docker/YeetFile/behind-proxy/dcc.sh index b083a10..0c7c9f9 100755 --- a/docker/YeetFile/behind-proxy/dcc.sh +++ b/docker/YeetFile/behind-proxy/dcc.sh @@ -1 +1,2 @@ -docker compose --env-file ../../env/.env.stack.yeetfile --env-file ../../env/.env.common config \ No newline at end of file +#docker create network -d brigde proxy +docker compose --env-file ../../env/YeetFile-stack.env --env-file ../../env/common.env config \ No newline at end of file diff --git a/docker/YeetFile/compose.yml b/docker/YeetFile/compose.yml index fdac103..325cdfc 100644 --- a/docker/YeetFile/compose.yml +++ b/docker/YeetFile/compose.yml @@ -1,7 +1,8 @@ +name: yeetfile # Docker Compose v2.20 or greater required to use "include" include: #################### NETWORKS #################### - - ../compose/networks/proxy.yaml - - ../compose/networks/socket-proxy.yaml + - ../compose/networks/${YEETFILE_NETWORk_ID}.yaml + - ../compose/networks/${YEETFILEDB_NETWORk_ID}.yaml #################### SERVICES #################### - ../compose/yeetfile.yaml diff --git a/docker/YeetFile/dcc.sh b/docker/YeetFile/dcc.sh index a29b32a..208cae3 100755 --- a/docker/YeetFile/dcc.sh +++ b/docker/YeetFile/dcc.sh @@ -1 +1,2 @@ -docker compose --env-file ../env/.env.stack.yeetfile --env-file ../env/.env.common config \ No newline at end of file +#docker create network -d bridge yeetfile +docker compose --env-file ../env/YeetFile-stack.env --env-file ../env/common.env config \ No newline at end of file diff --git a/docker/YeetFile/with-db/compose.yml b/docker/YeetFile/with-db/compose.yml index d7fddab..1d234b7 100644 --- a/docker/YeetFile/with-db/compose.yml +++ b/docker/YeetFile/with-db/compose.yml @@ -1,9 +1,9 @@ +name: yeetfile # Docker Compose v2.20 or greater required to use "include" include: #################### NETWORKS #################### - - ../compose/networks/proxy.yaml - - ../compose/networks/socket-proxy.yaml + - ../../compose/networks/${YEETFILE_NETWORk_ID}.yaml #################### SERVICES #################### - - ../compose/postgres.yaml - - ../compose/yeetfile.yaml + - ../../compose/postgres.yaml + - ../../compose/yeetfile.yaml \ No newline at end of file diff --git a/docker/YeetFile/with-db/dcc.sh b/docker/YeetFile/with-db/dcc.sh index 34d1ad0..f7a0732 100755 --- a/docker/YeetFile/with-db/dcc.sh +++ b/docker/YeetFile/with-db/dcc.sh @@ -1 +1,6 @@ -docker compose --env-file ../../env/.env.stack.yeetfile --env-file ../../env/.env.yeetfile --env-file ../../env/.env.common config \ No newline at end of file +#docker create network -d bridge yeetfile +#docker create network -d bridge backend +docker compose --env-file ../../env/YeetFile-stack.env \ +--env-file ../../env/YeetFile.env \ +--env-file ../../env/YeetFile-db.env \ +--env-file ../../env/common.env config diff --git a/docker/compose/yeetfile.yaml b/docker/compose/yeetfile.yaml index 5424d29..0d19d65 100644 --- a/docker/compose/yeetfile.yaml +++ b/docker/compose/yeetfile.yaml @@ -10,11 +10,10 @@ services: #ports: # - 8090:${YEETFILE_PORT:-8090} environment: - UID: ${UID:-1000} - GID: ${GID:-1000} - TZ: ${TZ} - YEETFILE_SERVER_SECRET: 2N1oTtwOHTyEbTFtz0yDLuzq3DhgjIWmSKw4gNcH8Vk= + - UID=${UID:-1000} + - GID=${GID:-1000} + - TZ=${TZ} env_file: - - path: ../env/.env.yeetfile + - path: ../env/YeetFile.env volumes: - ${DOCKERDIR}/yeetfile/uploads:/app/uploads