diff --git a/.gitignore b/.gitignore index d52842f..9ed5a7d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,6 @@ # git secret hidden .env wg-server/initial_config/wg-server.conf + +# docker data +data/ diff --git a/docker-compose.yml b/docker-compose.yml index ec7f71d..a32ed73 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ volumes: - /var/run/docker.sock:/var/run/docker.sock:ro - - http-proxy-acme:/acme:rw + - ./data/http-proxy-acme:/acme:rw ports: - 80:80 @@ -97,20 +97,6 @@ - traefik.http.routers.wiki-server.tls.certresolver=letsencrypt - traefik.http.services.wiki-server.loadbalancer.server.port=3000 -volumes: - # http proxy - http-proxy-acme: - - # ldap - ldap-server-db: - ldap-server-config: - - # wg - wg-server-ui-data: - - # wiki - wiki-db-data: - networks: # global network for web services web: diff --git a/ldap-server/docker-compose.yml b/ldap-server/docker-compose.yml index 1943145..4d0bd7e 100644 --- a/ldap-server/docker-compose.yml +++ b/ldap-server/docker-compose.yml @@ -18,8 +18,8 @@ # bootstrap - ./bootstrap-ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom:ro # database - - ldap-server-db:/var/lib/ldap:rw - - ldap-server-config:/etc/ldap/slapd.d:rw + - ../data/ldap-server-db:/var/lib/ldap:rw + - ../data/ldap-server-config:/etc/ldap/slapd.d:rw command: - "--copy-service" # do not modify bootstrap file @@ -36,7 +36,3 @@ - ./config/ldap-passwd-settings.ini:/opt/ldap-passwd-webui/settings.ini:ro restart: unless-stopped - -volumes: - ldap-server-db: - ldap-server-config: diff --git a/wg-server/docker-compose.yml b/wg-server/docker-compose.yml index 0b81114..e28b055 100644 --- a/wg-server/docker-compose.yml +++ b/wg-server/docker-compose.yml @@ -8,7 +8,7 @@ volumes: - ./initial_config:/initial_config:ro - - wg-server-ui-data:/app/data:rw + - ../data/wg-server-ui-data:/app/data:rw extra_hosts: - "host.docker.internal:host-gateway" @@ -42,6 +42,3 @@ - LDAP_SYNC_FILTER=(&(objectClass=organizationalPerson)(uid=*)) restart: unless-stopped - -volumes: - wg-server-ui-data: diff --git a/wiki/docker-compose.yml b/wiki/docker-compose.yml index 595b4a2..e665048 100644 --- a/wiki/docker-compose.yml +++ b/wiki/docker-compose.yml @@ -10,7 +10,7 @@ restart: unless-stopped volumes: - - wiki-db-data:/var/lib/postgresql/data + - ../data/wiki-db-data:/var/lib/postgresql/data:rw # server wiki-server: @@ -25,6 +25,3 @@ DB_PASS: ${WIKI_DB_PASSWORD} restart: unless-stopped - -volumes: - wiki-db-data: