File tree Expand file tree Collapse file tree 2 files changed +18
-1
lines changed Expand file tree Collapse file tree 2 files changed +18
-1
lines changed Original file line number Diff line number Diff line change @@ -54,15 +54,21 @@ load test_helpers
54
54
@test " [$TEST_FILE ] separated containers (nginx + docker-gen + nginx.tmpl)" {
55
55
docker_clean bats-nginx
56
56
docker_clean bats-docker-gen
57
+ docker_network_clean bats-docker-gen-network
58
+
59
+ # MAKE network
60
+ run docker network create bats-docker-gen-network
61
+ assert_success
57
62
58
63
# GIVEN a simple nginx container
59
64
run docker run -d \
60
65
--name bats-nginx \
66
+ --net=bats-docker-gen-network \
61
67
-v /etc/nginx/conf.d/ \
62
68
-v /etc/nginx/certs/ \
63
69
nginx:latest
64
70
assert_success
65
- run retry 5 1s docker run appropriate/curl --silent --fail --head http://$( docker_ip bats-nginx) /
71
+ run retry 5 1s docker run --net=bats-docker-gen-network appropriate/curl --silent --fail --head http://$( docker_ips bats-nginx) /
66
72
assert_output -l 0 $' HTTP/1.1 200 OK\r '
67
73
68
74
# WHEN docker-gen runs on our docker host
Original file line number Diff line number Diff line change @@ -8,11 +8,22 @@ function docker_clean {
8
8
sleep .25s
9
9
}
10
10
11
+ # Removes network $1
12
+ function docker_network_clean {
13
+ docker network rm $1 & > /dev/null || :
14
+ sleep .25s
15
+ }
16
+
11
17
# get the ip of docker container $1
12
18
function docker_ip {
13
19
docker inspect --format ' {{ .NetworkSettings.IPAddress }}' $1
14
20
}
15
21
22
+ # get the ip of docker container $1
23
+ function docker_ips {
24
+ docker inspect --format ' {{ range .NetworkSettings.Networks }}{{ .IPAddress }}{{ end }}' $1
25
+ }
26
+
16
27
# get the running state of container $1
17
28
# → true/false
18
29
# fails if the container does not exist
You can’t perform that action at this time.
0 commit comments