From d1c49c2f462d5f473e0e7788f861af0d247befd2 Mon Sep 17 00:00:00 2001 From: Gurulandia Date: Sun, 9 Feb 2025 11:47:01 +0200 Subject: [PATCH] change env file named --- docker/compose/flatnotes.yaml | 3 ++- docker/env/{.env.stack.flatnotes => flatnotes-stack.env} | 2 -- docker/env/{.env.flatnotes => flatnotes.env} | 0 docker/flatnotes/behind-proxy/compose.yaml | 2 +- docker/flatnotes/compose.yaml | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) rename docker/env/{.env.stack.flatnotes => flatnotes-stack.env} (86%) rename docker/env/{.env.flatnotes => flatnotes.env} (100%) diff --git a/docker/compose/flatnotes.yaml b/docker/compose/flatnotes.yaml index 1dab694..f790187 100644 --- a/docker/compose/flatnotes.yaml +++ b/docker/compose/flatnotes.yaml @@ -1,3 +1,4 @@ +name: flatnotes services: flatnotes: image: ${FLATNOTES_IMAGE}:${FLATNOTES_TAG} @@ -14,7 +15,7 @@ services: PGID: ${GID:-1000} TZ: ${TZ} env_file: - - path: ../env/.env.flatnotes + - path: ../env/flatnotes.env volumes: - ${DOCKERDIR}/flatnotes:/data # Optional. Allows you to save the search index in a different location: diff --git a/docker/env/.env.stack.flatnotes b/docker/env/flatnotes-stack.env similarity index 86% rename from docker/env/.env.stack.flatnotes rename to docker/env/flatnotes-stack.env index f83eb48..2720de6 100644 --- a/docker/env/.env.stack.flatnotes +++ b/docker/env/flatnotes-stack.env @@ -1,5 +1,3 @@ -COMPOSE_PROJECT_NAME=flatnotes - FLATNOTES_NETWORk_ID=proxy FLATNOTES_HOSTNAME=flatnotes diff --git a/docker/env/.env.flatnotes b/docker/env/flatnotes.env similarity index 100% rename from docker/env/.env.flatnotes rename to docker/env/flatnotes.env diff --git a/docker/flatnotes/behind-proxy/compose.yaml b/docker/flatnotes/behind-proxy/compose.yaml index df50893..d579e5f 100644 --- a/docker/flatnotes/behind-proxy/compose.yaml +++ b/docker/flatnotes/behind-proxy/compose.yaml @@ -1,6 +1,6 @@ # Docker Compose v2.20 or greater required to use "include" include: #################### NETWORKS #################### - - ../../compose/networks/proxy.yaml + - ../../compose/networks/${FLATNOTES_NETWORk_ID}.yaml #################### SERVICES #################### - ../../compose/flatnotes.yaml diff --git a/docker/flatnotes/compose.yaml b/docker/flatnotes/compose.yaml index 4c0f552..df50893 100644 --- a/docker/flatnotes/compose.yaml +++ b/docker/flatnotes/compose.yaml @@ -2,6 +2,5 @@ include: #################### NETWORKS #################### - ../../compose/networks/proxy.yaml - - ../../compose/networks/socket-proxy.yaml #################### SERVICES #################### - ../../compose/flatnotes.yaml