diff options
| author | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2022-03-25 14:23:57 +0100 |
|---|---|---|
| committer | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2022-03-25 14:23:57 +0100 |
| commit | 1708d88ca975e11af912d10f0d793ac6ee775919 (patch) | |
| tree | e64171a5a0093d22fd11a0f3d69d11343102a3fa /ci/docker/docker-compose.yml | |
| parent | bd8eda82e5d08d2ca33022b0533c831303a73019 (diff) | |
Add comments and minor fixups
Diffstat (limited to 'ci/docker/docker-compose.yml')
| -rw-r--r-- | ci/docker/docker-compose.yml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ci/docker/docker-compose.yml b/ci/docker/docker-compose.yml index f924571..9832871 100644 --- a/ci/docker/docker-compose.yml +++ b/ci/docker/docker-compose.yml @@ -1,9 +1,12 @@ version: '3' +# Common environment vars +# These are the credentials for the portal x-common-env: &common-env PORTAL_USER: ${PORTAL_USER} PORTAL_PASS: ${PORTAL_PASS} +# Define a network so that the containers can talk with eachother using their service name networks: eduvpn_network: ipam: @@ -11,12 +14,14 @@ networks: config: - subnet: 172.20.0.0/24 +# Defines the services services: + # The eduvpn server with portal eduvpnserver: build: context: "." dockerfile: 'ci/docker/eduvpn-server.docker' - sysctls: + sysctls: # needed for wireguard permissions, otherwise we get a permisison failed - net.ipv6.conf.all.disable_ipv6=0 networks: eduvpn_network: @@ -29,6 +34,7 @@ services: interval: 5s timeout: 10s retries: 10 + # The container for testing the go code gotest: build: context: "." @@ -37,6 +43,7 @@ services: networks: eduvpn_network: ipv4_address: 172.20.0.5 + # Wait for eduvpn server to come online depends_on: eduvpnserver: condition: service_healthy |