diff options
| author | Felipe Sateler <fsateler@debian.org> | 2019-11-22 21:15:41 -0300 |
|---|---|---|
| committer | Felipe Sateler <fsateler@debian.org> | 2019-11-22 21:15:41 -0300 |
| commit | 97b16e5404375cc6cca4469045984cac0eabd335 (patch) | |
| tree | b9cfdfec00f4a6afceed718cbb155651d23a51fc /tests/fixtures/env-file-override | |
| parent | 813ff34b5328e530d94c95cd8235431cde391e4c (diff) | |
| parent | d66f980dd002ce94c3196b1a74dc8c1a0788be06 (diff) | |
Update upstream source from tag 'upstream/1.25.0'
Update to upstream version '1.25.0'
with Debian dir 01225dadf264cb86293071829641cb341942031d
Diffstat (limited to 'tests/fixtures/env-file-override')
| -rw-r--r-- | tests/fixtures/env-file-override/.env.conf | 2 | ||||
| -rw-r--r-- | tests/fixtures/env-file-override/.env.override | 1 | ||||
| -rw-r--r-- | tests/fixtures/env-file-override/docker-compose.yml | 6 |
3 files changed, 9 insertions, 0 deletions
diff --git a/tests/fixtures/env-file-override/.env.conf b/tests/fixtures/env-file-override/.env.conf new file mode 100644 index 00000000..90b8b495 --- /dev/null +++ b/tests/fixtures/env-file-override/.env.conf @@ -0,0 +1,2 @@ +WHEREAMI +DEFAULT_CONF_LOADED=true diff --git a/tests/fixtures/env-file-override/.env.override b/tests/fixtures/env-file-override/.env.override new file mode 100644 index 00000000..398fa51b --- /dev/null +++ b/tests/fixtures/env-file-override/.env.override @@ -0,0 +1 @@ +WHEREAMI=override diff --git a/tests/fixtures/env-file-override/docker-compose.yml b/tests/fixtures/env-file-override/docker-compose.yml new file mode 100644 index 00000000..fdae6d82 --- /dev/null +++ b/tests/fixtures/env-file-override/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.7' +services: + test: + image: busybox + env_file: .env.conf + entrypoint: env |