From a512c0cb823f6ff3ae117850c807795206ad6f7d Mon Sep 17 00:00:00 2001 From: Muayyad Alsadi Date: Wed, 4 Sep 2019 16:12:13 +0300 Subject: [PATCH] #35: test for multiple -f --- tests/multicompose/README.md | 19 +++++++++++++++++++ tests/multicompose/d1/1.env | 1 + tests/multicompose/d1/12.env | 1 + tests/multicompose/d1/2.env | 1 + tests/multicompose/d1/docker-compose.yml | 9 +++++++++ tests/multicompose/d2/12.env | 1 + tests/multicompose/d2/2.env | 1 + tests/multicompose/d2/docker-compose.yml | 12 ++++++++++++ 8 files changed, 45 insertions(+) create mode 100644 tests/multicompose/README.md create mode 100644 tests/multicompose/d1/1.env create mode 100644 tests/multicompose/d1/12.env create mode 100644 tests/multicompose/d1/2.env create mode 100644 tests/multicompose/d1/docker-compose.yml create mode 100644 tests/multicompose/d2/12.env create mode 100644 tests/multicompose/d2/2.env create mode 100644 tests/multicompose/d2/docker-compose.yml diff --git a/tests/multicompose/README.md b/tests/multicompose/README.md new file mode 100644 index 0000000..da032a1 --- /dev/null +++ b/tests/multicompose/README.md @@ -0,0 +1,19 @@ +# Multiple compose files + +to make sure we get results similar to + +``` +docker-compose -f d1/docker-compose.yml -f d2/docker-compose.yml up -d +docker exec -ti d1_web1_1 sh -c 'set' +docker exec -ti d1_web2_1 sh -c 'set' +curl http://${d1_web1_1}:8001/index.txt +curl http://${d1_web1_1}:8002/index.txt +``` + +we need to verify + +- project base directory and prject name is `d1` +- `var12='d1/12.env'` which means `enf_file` was appened not replaced (which means that we normalize to array before merge) +- `var2='d1/2.env'` which means that paths inside `d2/docker-compose.yml` directory are relative to `d1` + + diff --git a/tests/multicompose/d1/1.env b/tests/multicompose/d1/1.env new file mode 100644 index 0000000..8137179 --- /dev/null +++ b/tests/multicompose/d1/1.env @@ -0,0 +1 @@ +var1=d1/1.env diff --git a/tests/multicompose/d1/12.env b/tests/multicompose/d1/12.env new file mode 100644 index 0000000..21f9bee --- /dev/null +++ b/tests/multicompose/d1/12.env @@ -0,0 +1 @@ +var12=d1/12.env diff --git a/tests/multicompose/d1/2.env b/tests/multicompose/d1/2.env new file mode 100644 index 0000000..76bc26c --- /dev/null +++ b/tests/multicompose/d1/2.env @@ -0,0 +1 @@ +var2=d1/2.env diff --git a/tests/multicompose/d1/docker-compose.yml b/tests/multicompose/d1/docker-compose.yml new file mode 100644 index 0000000..4d87e5a --- /dev/null +++ b/tests/multicompose/d1/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3' +services: + web1: + image: busybox + command: busybox httpd -h /var/www/html/ -f -p 8001 + volumes: + - ./1.env:/var/www/html/index.txt + env_file: ./1.env + diff --git a/tests/multicompose/d2/12.env b/tests/multicompose/d2/12.env new file mode 100644 index 0000000..f451eb9 --- /dev/null +++ b/tests/multicompose/d2/12.env @@ -0,0 +1 @@ +var12=d2/12.env diff --git a/tests/multicompose/d2/2.env b/tests/multicompose/d2/2.env new file mode 100644 index 0000000..4aa155f --- /dev/null +++ b/tests/multicompose/d2/2.env @@ -0,0 +1 @@ +var2=d2/2.env diff --git a/tests/multicompose/d2/docker-compose.yml b/tests/multicompose/d2/docker-compose.yml new file mode 100644 index 0000000..3ef8d3f --- /dev/null +++ b/tests/multicompose/d2/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3' +services: + web1: + env_file: ./12.env + + web2: + image: busybox + command: busybox httpd -h /var/www/html/ -f -p 8002 + volumes: + - ./2.env:/var/www/html/index.txt + env_file: ./2.env +