b03889ac2a
Add integration tests regarding environment
...
This covers what was included in #6800
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-07-31 02:09:41 +02:00
7a7c9ff67a
Merge pull request #6800 from KlaasH/revise-env-file-option
...
Make '--env-file' option top-level only and fix failure with subcommands
2019-07-25 12:15:11 +02:00
413e5db7b3
Add shell completions for --env-file option
...
Adds completions for the --env-file toplevel option to the bash, fish,
and zsh completions files.
Signed-off-by: Klaas Hoekema <khoekema@azavea.com>
2019-07-24 09:25:10 -04:00
69c0683bfe
Pass toplevel_environment to run_one_off_container
...
Instead of passing `project_dir` from `TopLevelCommand.run` to
`run_one_off_container` then using it there to load the toplevel
environment (duplicating the logic that `TopLevelCommand.toplevel_environment`
encapsulates), pass the Environment object.
Signed-off-by: Klaas Hoekema <khoekema@azavea.com>
2019-07-24 09:25:10 -04:00
088a798e7a
Fix typo in 'split_env' error message
...
Signed-off-by: Klaas Hoekema <khoekema@azavea.com>
2019-07-24 09:25:10 -04:00
35eb40424c
Call TopLevelCommand's environment 'toplevel_environment'
...
To help prevent confusion between the different meanings and sources
of "environment", rename the method that loads the environment from
the .env or --env-file (i.e. the one that applies at a project level)
to 'toplevel_environment'.
Signed-off-by: Klaas Hoekema <khoekema@azavea.com>
2019-07-24 09:25:05 -04:00
99464d9c2b
Handle environment file override within TopLevelCommand
...
Several (but not all) of the subcommands are accepting and processing the
`--env-file` option, but only because they need to look for a specific
value in the environment. The work of applying the override makes more
sense as the domain of TopLevelCommand, and moving it there and removing
the option from the subcommands makes things simpler.
Signed-off-by: Klaas Hoekema <khoekema@azavea.com>
2019-07-24 09:24:06 -04:00
cd8e2f870f
Merge pull request #6813 from ulyssessouza/fix_stdin_open
...
Fix stdin_open when running docker-compose run
2019-07-24 11:20:20 +02:00
c641ea08ae
Fix stdin_open when running docker-compose run
...
This fix makes sure that stdin_open specified in the service
is considering when shelling out to the CLI
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-07-22 17:27:10 +02:00
d285ba6aee
Merge pull request #6803 from ulyssessouza/pin-image-tags
...
Pin test images on a non rolling tag
2019-07-19 16:35:22 +02:00
cd098e0cad
Pin test images on a non rolling tag
...
Mainly busybox:latest to the current latest which is 1.31.0-uclibc
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-07-18 11:10:37 +02:00
d212fe68a6
Merge pull request #6728 from albers/completion-config--no-interpolate
...
Add bash completion for `config --no-interpolate`
2019-07-16 11:59:18 +02:00
c8279bc4db
Merge pull request #6738 from Inconnu08/set-optimization
...
Replace sets with set literal syntax for efficiency
2019-07-15 15:23:24 +02:00
61aa2e346e
Merge pull request #6797 from chris-crone/macos-bump-python-3.7.4
...
Bump macOS build dependency
2019-07-15 10:33:45 +02:00
98932e9cb4
Merge pull request #6754 from Goryudyuma/6740-fix-display
...
fix: The correct number is displayed
2019-07-15 10:30:59 +02:00
59491c7d77
add: test for units
...
Signed-off-by: Kei Matsumoto <umaretekyoumade@gmail.com>
2019-07-14 04:31:16 +09:00
75d41edb94
fix: Add test
...
Signed-off-by: Kei Matsumoto <umaretekyoumade@gmail.com>
2019-07-14 03:38:29 +09:00
f9099c91ae
fix: The correct number is displayed
...
Signed-off-by: Kei Matsumoto <umaretekyoumade@gmail.com>
2019-07-14 03:38:12 +09:00
1b326fce57
Merge pull request #6720 from ijc/pass-env-to-docker-cli
...
Pass environment when calling through to docker cli.
2019-07-12 10:11:47 +02:00
ca721728f6
Merge pull request #6588 from javabrett/6587-default-mand-interp-err
...
Default ?err to (missing) required VAR name. Fixed #6587 .
2019-07-11 17:17:46 +02:00
2e31ebba6a
Merge pull request #6798 from chris-crone/linux-bump-deps
...
Bump Linux build dependencies
2019-07-11 16:09:58 +02:00
993bada521
Bump Linux build dependencies
...
* Python 3.7.2 to 3.7.4
* Docker 18.09.5 to 18.09.7
* Alpine 3.9.3 to 3.10.0
* Debian stretch-20190326 to stretch-20190708
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2019-07-10 17:32:13 +02:00
b0e7d801a3
Bump macOS build dependency
...
* Python 3.7.3 to 3.7.4
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2019-07-10 17:03:45 +02:00
7258edb75d
Merge pull request #6793 from chris-crone/bump-openssl-1.1.1c-python-3.7.3
...
Bump macOS build dependencies
2019-07-08 18:42:35 +02:00
f9d1075a5d
Merge pull request #6792 from ulyssessouza/bump-texttable
...
Bump texttable from 0.9.1 to 1.6.2
2019-07-08 15:23:31 +02:00
a1c9d4925a
Merge pull request #6791 from ulyssessouza/bump-mock
...
Bump mock from 2.0.0 to 3.0.5
2019-07-08 15:23:22 +02:00
3d80c8e86d
Bump macOS build dependencies
...
* OpenSSL 1.1.1a to 1.1.1c
* Python 3.7.2 to 3.7.3
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2019-07-08 15:05:10 +02:00
0bfa1c34f0
Bump texttable from 0.9.1 to 1.6.2
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-07-08 14:52:30 +02:00
57a2bb0c50
Bump mock from 2.0.0 to 3.0.5
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-07-08 13:47:19 +02:00
3d693f3733
Merge pull request #6778 from ulyssessouza/cleanup-setup_py-versioning
...
Strip up generic versions and bump requests
2019-07-03 17:31:15 +02:00
ce5451c5b4
Strip up generic versions and bump requests
...
Replaces generic limitations with a next major value
Bump the minimal `requests` to 2.20.0
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-07-02 15:49:07 +02:00
df2e833cf0
Merge pull request #6777 from ulyssessouza/pin-busybox-image-version
...
Pin busybox image version in tests
2019-07-02 14:33:56 +02:00
cacc9752a3
Pin busybox image version in tests
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-07-02 13:42:41 +02:00
cf419dce4c
Add .fossa.yml file ( #6750 )
...
Add .fossa.yml file
2019-06-17 10:23:44 -07:00
8c387c6013
Add .fossa.yml file
...
This commit adds a .fossa.yml file used by fossa.io
It allows for fossa to scan the dependencies and figure out which oss
licenses are in use. This can be added to CI at some point in the near
future.
Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
2019-06-14 14:58:17 +01:00
57055e0e66
Replace sets with set literal syntax for efficiency
...
Signed-off-by: Taufiq Rahman <taufiqrx8@gmail.com>
2019-06-02 20:21:21 +06:00
c37fb783fe
replace sets with set literal syntax for efficiency
...
Signed-off-by: Taufiq Rahman <taufiqrx8@gmail.com>
2019-06-01 01:31:35 +06:00
b29b6a1538
replace sets with set literal syntax for efficiency
...
Signed-off-by: Taufiq Rahman <taufiqrx8@gmail.com>
2019-05-31 20:29:09 +06:00
d68113f5c0
Add bash completion for `config --no-interpolate`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2019-05-24 21:59:14 +02:00
26e1a2dd31
Merge pull request #6725 from ulyssessouza/fix-release-script
...
Fix release script get_full_version()
2019-05-23 23:37:06 +02:00
1f55b533c4
Fix release script get_full_version()
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-05-23 23:35:57 +02:00
fb4d5aa7e6
Include required but missing VAR name and assignment in interpolation error message.
...
Error message format is now e.g.:
ERROR: Missing mandatory value for "environment" option interpolating ['MYENV=${MYVAR:?}'] in service "myservice":
Fixed #6587 .
Signed-off-by: Brett Randall <javabrett@gmail.com>
2019-05-24 07:01:39 +10:00
e806520dc3
Merge pull request #6723 from ulyssessouza/fix-reorder-imports
...
Fix imports ordering
2019-05-23 22:04:50 +02:00
a2516c48d9
Fix imports ordering
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-05-23 22:04:02 +02:00
79639af394
Merge pull request #6721 from ulyssessouza/fix-release-finalize
...
Fix 'finalize' command on release script
2019-05-23 21:39:40 +02:00
2d2b0bd9a8
Fix 'finalize' command on release script
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-05-23 21:38:20 +02:00
9d2508cf58
Pass environment when calling through to docker cli.
...
This ensures that settings from any `.env` file (such as `DOCKER_HOST`) are
passed on to the cli.
Unit tests are adjusted for the new parameter and a new case is added to ensure
it is propagated as expected.
Fixes: 6661
Signed-off-by: Ian Campbell <ijc@docker.com>
2019-05-23 16:29:46 +01:00
e1baa90f6b
Merge pull request #6719 from ulyssessouza/fix-release-script
...
Fix release script for null user
2019-05-22 19:01:01 +02:00
c15e8af7f8
Fix release script for null user
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-05-22 19:00:16 +02:00
4218b46c78
Merge pull request #6666 from joakimr-axis/armpurge
...
Purge Dockerfile.armhf which is no longer needed
2019-05-22 16:27:09 +02:00
Ulysses Souza
Djordje Lukic
Klaas Hoekema
Silvin Lubecki
Jean-Christophe Sirot
Goryudyuma
Christopher Crone
Eli Uriegas
Dave Tucker
Inconnu08
Harald Albers
Brett Randall
Ian Campbell