diff --git a/compose.yml b/compose.yml index fe4a0931..eb23b688 100644 --- a/compose.yml +++ b/compose.yml @@ -1,9 +1,9 @@ --- include: - path: compose/base-images.compose.yml - project_directory: . + #project_directory: . - path: compose/proxies.compose.yml - project_directory: . + #project_directory: . services: dev-shell: diff --git a/compose/proxies.compose.yml b/compose/proxies.compose.yml index 7ed2c560..7b78e759 100644 --- a/compose/proxies.compose.yml +++ b/compose/proxies.compose.yml @@ -2,13 +2,13 @@ services: container-socket-proxy: build: - context: imags/container-socket-proxy + context: ../imags/container-socket-proxy dockerfile: Dockerfile image: 'localhost/l7/container-socket-proxy:latest' networks: container-control: ipv4_address: 10.7.9.2 - env_file: compose/container-socket-proxy.env + env_file: container-socket-proxy.env # TODO: Fix SElinux privileges of podman socket such that privileged-workaround for proxy not needed privileged: true volumes: @@ -20,7 +20,7 @@ services: auth-proxy: build: - context: imags/git-auth-proxy + context: ../imags/git-auth-proxy dockerfile: Dockerfile image: 'localhost/l7/auth-proxy:latest' networks: @@ -39,7 +39,7 @@ services: dns: build: - context: imags/dnsmasq + context: ../imags/dnsmasq dockerfile: Containerfile image: 'localhost/l7/dnsmasq:latest' ports: @@ -61,7 +61,7 @@ services: # package cache apt-cacher-ng: build: - context: imags/apt-cacher-ng + context: ../imags/apt-cacher-ng dockerfile: Containerfile image: 'localhost/l7/apt-cacher-ng:latest' restart: always @@ -85,7 +85,7 @@ services: - auth-proxy - dns build: - context: imags/caddy + context: ../imags/caddy dockerfile: Containerfile image: 'localhost/l7/caddy:latest' environment: @@ -103,7 +103,7 @@ services: public: volumes: - 'caddy_conf:/config:Z' - #- ./imags/caddy/default.yml:/etc/caddy/default.yml:ro + #- ../imags/caddy/default.yml:/etc/caddy/default.yml:ro tmpfs: - /data/caddy/certificates - /data/caddy/pki @@ -116,7 +116,7 @@ services: - beta image: 'localhost/l7/verdaccio:latest' build: - context: imags/verdaccio + context: ../imags/verdaccio dockerfile: Dockerfile environment: VERDACCIO_PUBLIC_URL: 'https://npmkg.internal' @@ -134,7 +134,7 @@ services: configs: verdaccio_cfg: - file: ./compose/configs/verdaccio.yml + file: configs/verdaccio.yml volumes: caddy_conf: