Commit Graph

425 Commits

Author SHA1 Message Date
Zuhayr Elahi 98d7cc8d0c
ADDED a stage for executing License Scans
Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
2019-09-13 14:25:06 -07:00
Antonio Gutierrez 66856e884c
requirements: update jsonschema dependency
Fixes: https://github.com/docker/compose/issues/6347

Signed-off-by: Antonio Gutierrez <chibby0ne@gmail.com>
2019-07-27 21:43:40 +02:00
Christopher Crone 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
Christopher Crone 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
Ulysses Souza 1f55b533c4 Fix release script get_full_version()
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-05-23 23:35:57 +02:00
Ulysses Souza a2516c48d9 Fix imports ordering
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-05-23 22:04:02 +02:00
Ulysses Souza 2d2b0bd9a8 Fix 'finalize' command on release script
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-05-23 21:38:20 +02:00
Ulysses Souza c15e8af7f8 Fix release script for null user
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-05-22 19:00:16 +02:00
Joakim Roubert 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
Ulysses Souza 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
Ulysses Souza 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
Ulysses Souza 9e3d9f6681 Update release process on updating docs
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-04-04 11:51:12 +02:00
Djordje Lukic ef10c1803f "Bump 1.24.0"
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-28 19:38:25 +01:00
Ulysses Souza 154d7c1722 Fix script for release file already present case
This avoids a:
"AttributeError: 'HTTPError' object has no attribute 'message'"

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-22 17:14:18 +01:00
Ulysses Souza 2948c396a6 Fix bintray docker-compose link
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-22 11:23:44 +01:00
Ulysses Souza 15f8c30a51 Fix typo on finalize
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-22 11:23:44 +01:00
Ulysses Souza cd1fcd3ea5 Use os.system() instead of run_setup()
Use `os.system()` instead of `run_setup()` because the last
is not taking any effect

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-22 11:23:36 +01:00
Christopher Crone 133df63108 Add built Python smoke test to macOS setup script
Prior to this smoke test, the macOS setup step wouldn't fail if the
Python that it built wasn't functional. This will make debugging Python
build issues easier in the future.

Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2019-02-21 16:21:09 +01:00
Christopher Crone dbc229dc37 Fix macOS build for Python 3.7
- Specify --with-openssl directory for Python build
- Better checks for downloaded SDK, OpenSSL, and Python
- Fix missing slash for Python build CPPFLAGS

Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2019-02-21 13:57:25 +01:00
Ulysses Souza bb0bd3b26b Harmonize tox and virtualenv versions
- Set all tox versions to 2.9.1
- Set all virtualenv version to 16.2.0

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-02-21 13:56:45 +01:00
Ulysses Souza a734371e7f Bump python version from 3.6.8 to 3.7.2
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-02-21 13:56:45 +01:00
Christopher Crone fbbf78d3da macOS: Bump OpenSSL to 1.1.1a
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2019-02-20 15:59:41 +01:00
Christopher Crone f1f0894c1b script.build.linux: Do not tail image build logs
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2019-02-05 10:50:55 +01:00
Christopher Crone 8ad4c08109 macOS: Bump Python and OpenSSL
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2019-02-05 10:40:03 +01:00
Joffrey F fee5261014 Always connect Compose container to stdin
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-12-19 00:24:33 -08:00
Joffrey F fc3df83d39 Update setup.py for modern pypi /setuptools
Remove pandoc dependencies

Signed-off-by: Joffrey F <joffrey@docker.com>
2018-11-30 17:59:55 -08:00
Joffrey F cfa5d02b52 Merge branch 'release' 2018-11-30 16:17:36 -08:00
Joffrey F 1110ad0108 "Bump 1.23.2"
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-11-28 14:26:26 -08:00
Ulysses Souza 1affc55b17 Adopts 'unknown' as build revision in case git cannot retrieve it.
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2018-11-22 15:58:41 +01:00
Joffrey F b02f130684 "Bump 1.23.1"
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-10-31 14:49:00 -07:00
Joffrey F 91182ccb34 Merge branch 'release'
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-10-30 14:26:40 -07:00
Joffrey F 3104597e7d "Bump 1.23.0"
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-10-29 11:43:45 -07:00
Joffrey F 45189c134d "Bump 1.23.0-rc3"
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-10-17 12:16:34 -07:00
Joffrey F 5ab3e47b42 Add workaround for Debian/Ubuntu venv setup failure
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-10-17 12:12:52 -07:00
Joffrey F da25be8f99 Fix ImageManager inconsistencies
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-10-17 12:12:49 -07:00
Joffrey F c9107cff39 Fix arg checks in release.sh
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-10-17 12:12:49 -07:00
Joffrey F 51d44c7ebc Add pypirc check
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-10-17 12:12:49 -07:00
Joffrey F 5cf25f519e Decontainerize release script Credentials management inside containers is a mess. Let's work on the host instead.
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-10-17 12:12:46 -07:00
Joffrey F 7712d19b32 Add workaround for Debian/Ubuntu venv setup failure
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-10-17 12:10:08 -07:00
Joffrey F bd67b90869 Fix ImageManager inconsistencies
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-10-12 06:39:56 -07:00
Joffrey F 297bee897b Fix arg checks in release.sh
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-10-12 06:14:35 -07:00
Joffrey F be324d57a2 Add pypirc check
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-10-12 06:13:55 -07:00
Silvin Lubecki 350a555e04 "Bump 1.23.0-rc2"
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2018-10-08 17:10:25 +02:00
Joffrey F 099c887b59 Re-enable testing of TP and beta releases
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-10-08 17:06:23 +02:00
Joffrey F 970f8317c5 Fix twine upload for RC versions
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-10-08 17:06:19 +02:00
Joffrey F 756eae0f01
Merge pull request #6251 from docker/decontainerize-release
Decontainerize release script
2018-10-05 19:03:23 +02:00
Joffrey F 6a35663781 Decontainerize release script
Credentials management inside containers is a mess. Let's work on the host instead.

Signed-off-by: Joffrey F <joffrey@docker.com>
2018-10-05 08:21:39 -07:00
Joffrey F e3e93d40a8
Merge pull request #6248 from docker/test-betas-and-tps
Re-enable testing of TP and beta releases
2018-10-04 11:14:41 +02:00
Joffrey F b21a06cd6f Re-enable testing of TP and beta releases
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-10-04 01:40:39 -07:00
Joffrey F 7b02f4c3a7
Merge pull request #6246 from docker/fix_twine_upload
Fix twine upload for RC versions
2018-10-04 10:39:31 +02:00
Joffrey F 25e419c763 Fix twine upload for RC versions
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-10-04 00:48:53 -07:00
Gabriel Machado 8493540a1c Reffer Docker for Mac and Windows as Docker Desktop
Signed-off-by: Gabriel Machado <gabriel.ms1@hotmail.com>
2018-09-29 21:17:26 -03:00
Joffrey F 320e4819d8 Avoid cred helpers errors in release script
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-09-26 21:10:56 +00:00
Joffrey F 772a307192 Avoid cred helpers errors in release script
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-09-26 13:58:13 -07:00
Joffrey F 47d740b800 Fix some release script issues
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-09-25 23:45:08 +00:00
Joffrey F 4b4c250638 Fix some release script issues
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-09-24 20:05:40 -07:00
Joffrey F 936e6971f9 "Bump 1.23.0-rc1"
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-09-24 23:46:38 +00:00
Joffrey F f80630ffcf
Merge pull request #6140 from docker/4688_no_sequential_ids
Add randomly generated slug to container names to prevent collisions
2018-09-19 15:12:41 -07:00
Maxwell Bloch a7c05f41f1 Handle userns security
- Adds `--userns=host` when `userns-remap` is set

Signed-off-by: Maxwell Bloch <maxwellbloch@live.com>
2018-09-12 19:29:03 -04:00
Joffrey F 5916639383 Preserve container numbers, add slug to prevent name collisions
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-09-12 12:07:52 -07:00
Joffrey F d491a81cec Skip testing TPs/betas for now
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-09-10 15:08:10 -07:00
ruicao 5713215e84 Typo fix: overriden -> overridden
Signed-off-by: ruicao <ruicao@alauda.io>
2018-09-07 16:08:19 +08:00
Joffrey F 5ad50dc0b3 Bump Python SDK -> 3.5.0
Add support for Python 3.7

Signed-off-by: Joffrey F <joffrey@docker.com>
2018-08-09 18:31:08 -07:00
Arkadiusz Dzięgiel 7f9c042300 Fixes pipe handling in container mode.
Closes #4599, #4460

- adds a way to provide options from env in both cases (tty & non tty)
- allocates TTY only if both stdin & stdout are TTYs
- enables interactive mode if stdin is not TTY

Signed-off-by: Arkadiusz Dzięgiel <arkadiusz.dziegiel@glorpen.pl>
2018-07-24 12:23:31 +02:00
Christopher Crone 450efd557a macOS: Rework build scripts
Allows us to build for older versions of macOS by downloading an
older SDK and building OpenSSL and Python against it.

Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2018-07-23 11:41:32 +02:00
Joffrey F 6cb17b90ef 1.23.0dev
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-07-18 11:11:34 -07:00
Joffrey F 1396cdb4be
Merge pull request #6088 from docker/release
Resync master with release
2018-07-18 11:00:56 -07:00
Joffrey F f46880fe9a "Bump 1.22.0"
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-07-17 22:48:24 +00:00
Joffrey F cda827cbfc Improve finalize robustness and allow resume using special --finalize-resume flag
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-07-17 22:47:23 +00:00
Joffrey F 8c0411910d Avoid unrelated file uploads with twine
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-07-17 22:47:23 +00:00
Joffrey F d9545a5909 Add distclean to remove old build files
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-07-17 22:47:23 +00:00
Joffrey F cb1b88c4f8 s/release.py/release.sh/
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-07-17 22:47:23 +00:00
Joffrey F d7f5220292 Improve finalize robustness and allow resume using special --finalize-resume flag
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-07-09 16:51:01 -04:00
Joffrey F 0b5f68098c Avoid unrelated file uploads with twine
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-07-09 16:25:06 -04:00
Joffrey F 8a7ee5a7d5 Add distclean to remove old build files
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-07-09 16:19:17 -04:00
Joffrey F e9aaece40d s/release.py/release.sh/
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-07-09 15:46:56 -04:00
Matthieu Nottale 6817b533a8 "Bump 1.22.0-rc2"
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
2018-07-05 15:10:31 +00:00
Joffrey F a82986943b Fix release script
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-06-21 13:48:32 -07:00
Joffrey F 1fb5039585 Bump 1.22.0-rc1
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-06-21 13:28:13 -07:00
Joffrey F e8af19daa3 Fix release script
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-06-21 13:28:13 -07:00
Joffrey F 47584a37c9 Fix bintray API client
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-06-21 11:49:35 -07:00
Joffrey F 709ba0975d Release script fixes
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-06-21 11:40:32 -07:00
Joffrey F 05638ab5ea Esnure docker-compose binary is executable (fixes #5917)
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-28 13:42:24 -07:00
Joffrey F 31a4ceeab0
Merge pull request #5916 from docker/autotests_fixes
Auto release improvements
2018-04-27 19:16:25 -07:00
Joffrey F e6aedb1ce0 Partial revert bc03441550
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-27 18:48:30 -07:00
Joffrey F 5eb3f4b32f Typo fix
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-27 18:43:05 -07:00
Joffrey F bc03441550 Automatically detect pickable PRs for patch releases
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-27 18:36:48 -07:00
Joffrey F bb44d06f07
Merge pull request #5915 from docker/autotests_fixes
Improve release automation
2018-04-27 15:26:28 -07:00
Joffrey F 90c89e34f1 Finalize fixes
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-27 15:06:36 -07:00
Joffrey F 948ce555da Merge branch 'release'
Conflicts:
	compose/__init__.py
2018-04-27 14:50:37 -07:00
Joffrey F d469113b37 Improve release automation
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-27 12:24:43 -07:00
Joffrey F fe20526d05 Remove obsolete release scripts
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-27 19:07:13 +00:00
Joffrey F 7503a2eddd Document new release process
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-27 19:07:12 +00:00
Joffrey F a50c056d7c Uncomment deploy steps
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-27 19:07:12 +00:00
Joffrey F 4faf7c19b6 Containerize release tool
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-27 19:07:12 +00:00
Joffrey F 28f7f79fea Improve monitor function
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-27 19:07:12 +00:00
Joffrey F 87b8eaa27c Cleanup
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-27 19:07:12 +00:00
Joffrey F b68811fd7f Add support for PR cherry picks
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-27 19:07:12 +00:00
Joffrey F 4fab78d7e0 Default base is master
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-27 19:07:12 +00:00
Joffrey F 0621739a86 Early check for non-draft release in resume
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-27 19:07:12 +00:00