a78e3b0c7c
Bump docker-py
...
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
2019-06-24 10:38:39 +02:00
5e7521909d
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-24 10:38:38 +02:00
272e85dce3
Merge remote-tracking branch 'origin/release' into bump-1.24.1
2019-06-24 10:38:25 +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
2bc4161526
Merge pull request #6726 from docker/bump-1.25.0-rc1
...
Bump 1.25.0-rc1
2019-05-24 00:33:04 +02:00
8552e8e283
"Bump 1.25.0-rc1"
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-05-23 23:39:09 +02:00
3803d35c03
Merge remote-tracking branch 'upstream/release' into bump-1.25.0-rc1
2019-05-23 23:38:30 +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
81258f59db
Merge pull request #6715 from ulyssessouza/bump-dockerpy-401
...
Bump docker-py 4.0.1
2019-05-22 14:11:07 +02:00
e4b4babc24
Bump docker-py 4.0.1
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-05-22 11:55:37 +02:00
f764faa841
Merge pull request #6649 from GeyseR/requests_upgrade
...
support requests up to 2.22.0 version
2019-05-21 13:36:31 +01:00
a857be3f7e
support requests up to 2.22.x version
...
Signed-off-by: Sergey Fursov <geyser85@gmail.com>
2019-05-21 14:50:17 +03:00
a89128118b
Merge pull request #6342 from collin5/b5547
...
--remove-orphans is ignored when using up --no-start
2019-05-20 15:45:24 +01:00
263d18ce93
Merge pull request #6624 from orisano/feat-empty-cache-from
...
feat: drop empty tag on cache_from
2019-05-20 15:35:48 +01:00
51ee6093df
feat: drop empty tag on cache_from
...
Signed-off-by: Nao YONASHIRO <owan.orisano@gmail.com>
2019-05-20 23:32:15 +09:00
9de6ec3700
Merge pull request #6695 from Inconnu08/fix_depreciation
...
fixes warn method is deprecated
2019-05-20 12:34:51 +02:00
99e67d0c06
fix warning method is deprecated with tests
...
Signed-off-by: Taufiq Rahman <taufiqrx8@gmail.com>
2019-05-15 23:46:12 +06:00
75d5eb0108
Merge pull request #6707 from ulyssessouza/clean-containers-before-rm
...
Remove remaining containers on test_build_run
2019-05-15 11:44:37 +02:00
8a9575bd0d
Remove remaining containers on test_build_run
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-05-14 19:13:21 +02:00
b612361541
Merge pull request #6654 from jkldgoefgkljefogeg/master
...
fix #6579 cli ps --all
2019-05-14 11:53:04 +02:00
c2783d6f88
fix #6579 cli ps --all
...
Signed-off-by: Seedf <github_commit@nohdmi.com>
2019-05-13 18:56:43 -07:00
a5b13f369d
Merge pull request #6700 from ulyssessouza/bump_urllib3
...
Bump urllib3
2019-05-13 14:07:21 +02:00
3a47000e71
Bump urllib3
...
Signed-off-by: ulyssessouza <ulysses.souza@docker.com>
2019-05-12 13:33:38 +02:00
482bca9519
Purge Dockerfile.armhf which is no longer needed
...
Current Dockerfile builds fine for armhf and thus the outdated
Dockerfile.armhf is unnecessary.
Change-Id: Idafdb9fbddedd622c2c0aaddb1d5331d81cfe57d
Signed-off-by: Joakim Roubert <joakimr@axis.com>
2019-04-23 09:53:42 +02:00
79557e3d3a
Merge pull request #6657 from ulyssessouza/skip_race_condition_test
...
Avoid race condition on test
2019-04-19 16:37:14 +02:00
f2dc923084
Avoid race condition on test
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-04-19 15:53:02 +02:00
8a89d94e15
Merge pull request #6641 from ulyssessouza/dockerfiles_refactor
...
Refactor Dockerfiles for generating musl binaries
2019-04-19 11:46:41 +02:00
e047169315
Workaround race conditions on tests
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-04-17 17:59:12 +02:00
2b24eb693c
Refactor release and build scripts
...
- Make use of the same Dockerfile when producing
an image for testing and for deploying to
DockerHub
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-04-17 16:08:33 +02:00
c217bab7f6
Refactor Dockerfiles for generating musl binaries
...
- Refactor Dockerfile to be used for tests and distribution on docker hub on debian and alpine
to use for final usage and also tests
- Adapt test scripts to the new Dockerfiles' structure
- Adapt Jenkinsfile to add alpine to the test matrix
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-04-17 16:08:33 +02:00
5265f63c34
Merge pull request #6632 from ulyssessouza/update-releasedocs
...
Update release process on updating docs
2019-04-04 15:05:49 +02:00
9e3d9f6681
Update release process on updating docs
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-04-04 11:51:12 +02:00
41c8df39fe
Merge pull request #6618 from ulyssessouza/bump-1.24.0-changelog
...
Bump 1.24.0 changelog on master
2019-03-29 14:38:20 +01:00
ef10c1803f
"Bump 1.24.0"
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-28 19:38:25 +01:00
d9fa8158c3
Merge pull request #6616 from docker/bump-1.24.0
...
Bump 1.24.0
2019-03-28 18:58:40 +01:00
Djordje Lukic
Dave Tucker
Eli Uriegas
Inconnu08
Harald Albers
Ulysses Souza
Brett Randall
Ian Campbell
Ian Campbell
Sergey Fursov
Nao YONASHIRO
noname
Joakim Roubert
Djordje Lukic