Skip to content

Commit 53f3d44

Browse files
committed
chore: legacy compose compatibility
containers/podman-compose#999
1 parent c3d5ac8 commit 53f3d44

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
include:
33
- path: compose/base-images.compose.yml
4-
project_directory: .
4+
#project_directory: .
55
- path: compose/proxies.compose.yml
6-
project_directory: .
6+
#project_directory: .
77

88
services:
99
dev-shell:

compose/proxies.compose.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
services:
33
container-socket-proxy:
44
build:
5-
context: imags/container-socket-proxy
5+
context: ../imags/container-socket-proxy
66
dockerfile: Dockerfile
77
image: 'localhost/l7/container-socket-proxy:latest'
88
networks:
99
container-control:
1010
ipv4_address: 10.7.9.2
11-
env_file: compose/container-socket-proxy.env
11+
env_file: container-socket-proxy.env
1212
# TODO: Fix SElinux privileges of podman socket such that privileged-workaround for proxy not needed
1313
privileged: true
1414
volumes:
@@ -20,7 +20,7 @@ services:
2020

2121
auth-proxy:
2222
build:
23-
context: imags/git-auth-proxy
23+
context: ../imags/git-auth-proxy
2424
dockerfile: Dockerfile
2525
image: 'localhost/l7/auth-proxy:latest'
2626
networks:
@@ -39,7 +39,7 @@ services:
3939

4040
dns:
4141
build:
42-
context: imags/dnsmasq
42+
context: ../imags/dnsmasq
4343
dockerfile: Containerfile
4444
image: 'localhost/l7/dnsmasq:latest'
4545
ports:
@@ -61,7 +61,7 @@ services:
6161
# package cache
6262
apt-cacher-ng:
6363
build:
64-
context: imags/apt-cacher-ng
64+
context: ../imags/apt-cacher-ng
6565
dockerfile: Containerfile
6666
image: 'localhost/l7/apt-cacher-ng:latest'
6767
restart: always
@@ -85,7 +85,7 @@ services:
8585
- auth-proxy
8686
- dns
8787
build:
88-
context: imags/caddy
88+
context: ../imags/caddy
8989
dockerfile: Containerfile
9090
image: 'localhost/l7/caddy:latest'
9191
environment:
@@ -103,7 +103,7 @@ services:
103103
public:
104104
volumes:
105105
- 'caddy_conf:/config:Z'
106-
#- ./imags/caddy/default.yml:/etc/caddy/default.yml:ro
106+
#- ../imags/caddy/default.yml:/etc/caddy/default.yml:ro
107107
tmpfs:
108108
- /data/caddy/certificates
109109
- /data/caddy/pki
@@ -116,7 +116,7 @@ services:
116116
- beta
117117
image: 'localhost/l7/verdaccio:latest'
118118
build:
119-
context: imags/verdaccio
119+
context: ../imags/verdaccio
120120
dockerfile: Dockerfile
121121
environment:
122122
VERDACCIO_PUBLIC_URL: 'https://npmkg.internal'
@@ -134,7 +134,7 @@ services:
134134

135135
configs:
136136
verdaccio_cfg:
137-
file: ./compose/configs/verdaccio.yml
137+
file: configs/verdaccio.yml
138138

139139
volumes:
140140
caddy_conf:

0 commit comments

Comments
 (0)