rename docker folder (#1)

move docker-compose to root
georchestra · Jan 21, 2025 · 48da1eb · 48da1eb
1 parent d292848
commit 48da1eb
Show file tree

Hide file tree

Showing 16 changed files with 5 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "docker/config"]
-	path = docker/config
+	path = georchestra/config
 	url = [email protected]:georchestra/datadir.git
     branch = docker-24.0
diff --git a/docker/docker-compose.yml → docker-compose.yml b/docker/docker-compose.yml → docker-compose.yml
@@ -1,13 +1,13 @@
 
 include:
-  - geor-compose.yml
-  - geor-compose.override.yml
+  - georchestra/geor-compose.yml
+  - georchestra/geor-compose.override.yml
 
 services:
   maelstro-back:
-    build: ../backend
+    build: ./backend
     volumes:
-      - ../backend:/app
+      - ./backend:/app
     healthcheck:
       test: "/app/health_check.py"
       interval: 10s

diff --git a/docker/.envs-common → georchestra/.envs-common b/docker/.envs-common → georchestra/.envs-common
diff --git a/docker/.envs-database-datafeeder → georchestra/.envs-database-datafeeder b/docker/.envs-database-datafeeder → georchestra/.envs-database-datafeeder
diff --git a/docker/.envs-database-georchestra → georchestra/.envs-database-georchestra b/docker/.envs-database-georchestra → georchestra/.envs-database-georchestra
diff --git a/docker/.envs-hosts → georchestra/.envs-hosts b/docker/.envs-hosts → georchestra/.envs-hosts
diff --git a/docker/.envs-ldap → georchestra/.envs-ldap b/docker/.envs-ldap → georchestra/.envs-ldap
diff --git a/docker/.envs-rabbitmq → georchestra/.envs-rabbitmq b/docker/.envs-rabbitmq → georchestra/.envs-rabbitmq
diff --git a/...fig-to-host-maelstro-backend-servic.patch → ...fig-to-host-maelstro-backend-servic.patch b/...fig-to-host-maelstro-backend-servic.patch → ...fig-to-host-maelstro-backend-servic.patch
diff --git a/docker/README.md → georchestra/README.md b/docker/README.md → georchestra/README.md
diff --git a/docker/config → georchestra/config b/docker/config → georchestra/config
diff --git a/docker/geor-compose.override.yml → georchestra/geor-compose.override.yml b/docker/geor-compose.override.yml → georchestra/geor-compose.override.yml
diff --git a/docker/geor-compose.yml → georchestra/geor-compose.yml b/docker/geor-compose.yml → georchestra/geor-compose.yml
diff --git a/docker/resources/caddy/etc/Caddyfile → georchestra/resources/caddy/etc/Caddyfile b/docker/resources/caddy/etc/Caddyfile → georchestra/resources/caddy/etc/Caddyfile
diff --git a/...rets/geoserver_privileged_user_passwd.txt → ...rets/geoserver_privileged_user_passwd.txt b/...rets/geoserver_privileged_user_passwd.txt → ...rets/geoserver_privileged_user_passwd.txt
diff --git a/docker/secrets/slapd_password.txt → georchestra/secrets/slapd_password.txt b/docker/secrets/slapd_password.txt → georchestra/secrets/slapd_password.txt