Commit Graph
138 Commits
Author SHA1 Message Date
Sebastiaan van Stijn 4443ce1c21 Bump golang 1.11.13 (CVE-2019-9512, CVE-2019-9514)
go1.11.13 (released 2019/08/13) includes security fixes to the net/http and net/url packages.
See the Go 1.11.13 milestone on our issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.11.13

- net/http: Denial of Service vulnerabilities in the HTTP/2 implementation
  net/http and golang.org/x/net/http2 servers that accept direct connections from untrusted
  clients could be remotely made to allocate an unlimited amount of memory, until the program
  crashes. Servers will now close connections if the send queue accumulates too many control
  messages.
  The issues are CVE-2019-9512 and CVE-2019-9514, and Go issue golang.org/issue/33606.
  Thanks to Jonathan Looney from Netflix for discovering and reporting these issues.
  This is also fixed in version v0.0.0-20190813141303-74dc4d7220e7 of golang.org/x/net/http2.
  net/url: parsing validation issue
- url.Parse would accept URLs with malformed hosts, such that the Host field could have arbitrary
  suffixes that would appear in neither Hostname() nor Port(), allowing authorization bypasses
  in certain applications. Note that URLs with invalid, not numeric ports will now return an error
  from url.Parse.
  The issue is CVE-2019-14809 and Go issue golang.org/issue/29098.
  Thanks to Julian Hector and Nikolai Krein from Cure53, and Adi Cohen (adico.me) for discovering
  and reporting this issue.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9a7c1a1e5f0858ac54f1c7577c4fca8665f70496
Component: packaging
2019-08-14 03:22:12 +02:00
Eli Uriegas b494c289b9 [18.09] bump golang 1.11.12 (#364)
[18.09] bump golang 1.11.12
Upstream-commit: 4ff284459622c0610017e68df53fc4e55363ed8d
Component: packaging
2019-08-06 15:19:25 -07:00
Sebastiaan van Stijn ff2d7c542f Pin Golang images to debian stretch variant
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 1310e3974e8193745ce70cd74a20ab9d2151b8ac)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 32cdb89aac13e9af7446891eab8fb1aa54c22034
Component: packaging
2019-08-06 23:37:11 +02:00
Kir Kolyshkin 0f4d86716a Bump Go to 1.11.12
go1.11.12 (released 2019/07/08) includes fixes to the compiler and the linker.
See the Go 1.11.12 milestone on our issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.11.12

Full diff: https://github.com/golang/go/compare/go1.11.11...go1.11.12

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: f8eb0d84d32b427805b1d7afee815375f92fe2ee
Component: packaging
2019-07-23 16:37:25 -07:00
Eli Uriegas 531574846b [18.09 backport] require container-selinux >= 2.74 (#352)
[18.09 backport] require container-selinux >= 2.74
Upstream-commit: 2dfffcfb076dccf33ac345fb3475bc349d68459d
Component: packaging
2019-07-09 12:40:17 -10:00
Sebastiaan van Stijn 29233058d5 Bump golang 1.11.11
go1.11.11 (released 2019/06/11) includes a fix to the crypto/x509 package.
See the Go 1.11.11 milestone on the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.11.11

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f33c398df1eabda69ca05ff6c5c45351790a8696
Component: packaging
2019-07-08 11:33:07 +02:00
Sebastiaan van Stijn cd1b18d66d Bump Golang 1.11.5 (CVE-2019-6486)
See the milestone for details;
https://github.com/golang/go/issues?q=milestone%3AGo1.11.5+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a86dd09775725e0ea79bcc25613879d09d11ba0c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f571ca6a512ac099bdb5a8cd4c44f6256b60fa70
Component: packaging
2019-07-08 11:32:04 +02:00
Sebastiaan van Stijn 19cae1634a Bump Golang 1.11.3 (CVE-2018-16875)
go1.11.3 (released 2018/12/14)

- crypto/x509: CPU denial of service in chain validation golang/go#29233
- cmd/go: directory traversal in "go get" via curly braces in import paths golang/go#29231
- cmd/go: remote command execution during "go get -u" golang/go#29230

See the Go 1.11.3 milestone on the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.11.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 517a30b48d7b483e27eb3c3328356a8e83272988)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 17565b93d361b1b189962b3e98c431316a7cc628
Component: packaging
2019-07-08 11:31:50 +02:00
Sebastiaan van Stijn 5033fdcda8 Revert "[18.09] Bump Golang 1.10.8 (CVE-2019-6486)"
This reverts commit 9aec27794cc1e702bd9b9f3ac476695fc0d522a4.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e05230d281769067cc4e9224218f25634f5b894a
Component: packaging
2019-07-08 11:31:25 +02:00
Eli Uriegas df56d66f46 Remove the pkcs11 tag, was a holdover from cli
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 76f7249ca4695f58cee9773cb8b8036e698c576b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 095a4c109d5ba3444ace84e53f363eb4855e57d2
Component: packaging
2019-06-26 01:01:03 +02:00
Sebastiaan van Stijn 0ac05a6a78 require container-selinux >= 2.74
version 2.9 is really old; this sets the same minimal version
as is used for the containerd.io package

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a246b19b0723d41a8e58ff42d3af52fd57a7e94d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 95dea749d4cb7e474194bbe209f052e94da5df2e
Component: packaging
2019-06-26 00:48:50 +02:00
Stefan Scherer 591f85d1f1 Add PLATFORM to deb and rpm build
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
(cherry picked from commit 119bb518ff5bf382b29971805f5c7ba16f960b21)
Upstream-commit: 6d0273d5c0ffd30c3cefd9caca61595f235dc01e
Component: packaging
2019-04-09 07:34:48 +02:00
docker-unir[bot] 93dc56c138 Merge pull request #293 from thaJeztah/18.09_bump_golang_1.10.8
Merged with https://github.com/seemethere/unir
Upstream-commit: c7bc734ebfe74b6dd3bf298dd384b6860f4a7e74
Component: packaging
2019-02-12 19:59:07 +00:00
Eli Uriegas 4d35d88be8 Bump containerd.io dep >= 1.2.2-3 (CVE-2019-5736)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 06b649e2b07f74a94f3dbbcb233e13177a76a929
Component: packaging
2019-02-08 21:40:09 +00:00
Sebastiaan van Stijn 1f467bcdc6 [18.09] Bump Golang 1.10.8 (CVE-2019-6486)
See the milestone for details;
https://github.com/golang/go/issues?q=milestone%3AGo1.10.8+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9aec27794cc1e702bd9b9f3ac476695fc0d522a4
Component: packaging
2019-01-23 23:59:33 +01:00
Sebastiaan van Stijn 2b827d4782 Remove obsolete "selinux" and "engine" packages from CLI rpm
The CLI package does not provide the functionality of the
"selinux" and "engine" packages (it does _conflict_ with
older engine packages though).

This removes the "obsoletes" from the CLI package, as the
Engine package already obsoletes the other ones.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d4e1ddb963a43ff9f0a06e4ed1b37307c8f26a17)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9e6f124b6b5deba3878ad242661d1991881f33b9
Component: packaging
2018-12-17 18:04:48 +01:00
Eli Uriegas 2b2dcff273 bump to golang 1.10.6
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 010a8c218dacf18f97aa976ac17c3863ec36b9d5)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: d5e1848a813b3019e44db7581848a66869972e56
Component: packaging
2018-12-13 23:53:43 +00:00
Eli Uriegas 89559b9c3c Remove unused spec files
We don't use these spec files to actually build from anymore so we
should just go through and remove them.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit b98d7aad1e153c18da5b488afc40ba751f90cb36)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9d68fe72f3649fad5e3f902602c8ae9ab4a6abe5
Component: packaging
2018-12-05 15:12:29 +01:00
Andrew Hsu 11442eb1e7 bump golang to 1.10.5
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit c658dc545952bf4728e0ef3ff281bfa8823d60cb)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: df92c55b0ceefb75736d5d1f31a13f8400534a8b
Component: packaging
2018-12-03 22:21:44 +00:00
docker-unir[bot] ffd5999784 Merge pull request #260 from thaJeztah/18.09_remove_telemetry_remnants
Merged with https://github.com/seemethere/unir
Upstream-commit: 091c4453b8e294b0e10ea9fe24c784c2086719be
Component: packaging
2018-12-03 19:40:52 +00:00
Eli Uriegas 8293f65feb Add socket activation for RHEL based distributions
Removes the systemd drop-in unit file for socket activation and instead
prefers socket activation by default for both RHEL based and DEBIAN
based distributions.

Socket activation for RHEL based distributions was tested on CentOS 7 and Fedora 28.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 91c85cd38197b9d92d5b3e8a1b577d3178d73fcc)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 6a7e302c260a2ff7e4d8b7a6d01249a09c140618
Component: packaging
2018-11-30 19:43:29 +00:00
Sebastiaan van Stijn 9c47bb0899 Remove containerd dependency from CLI
The RPM packages list containerd as a hard dependency. While
having containerd installed allows certain features (e.g., allow
you to run `docker engine activate`), this should not be a requirement
for installing the Docker CLI, as it limits the use of this package
for situations where the CLI is installed to connect to a remote
daemon.

This patch removes the containerd dependency from the RPM packages
(the deb packages don't have this dependency, so no change is needed
in those packages)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 037349c5dc3f18d3bea3be0217e249f716a8be25)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: bc3867a8f6e59c56c967720c33c6ce9a65b64b7b
Component: packaging
2018-11-28 18:19:44 +00:00
Eli Uriegas 74513be78c Merge pull request #267 from thaJeztah/18.09_restore_requires
[18.09] Add back requirements that were removed in the migration
Upstream-commit: 12dff4169636676f40f782d1327c24e8ccb18f7c
Component: packaging
2018-11-28 12:15:16 -06:00
Sebastiaan van Stijn 60a25b4d26 Add back requirements that were removed in the migration
During the migration to "image based builds", some dependencies
were removed.

This patch brings back those dependencies.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a6ff66f1a51af62c9fd17a8b931f8a9b0283247a
Component: packaging
2018-11-28 15:44:43 +01:00
Sebastiaan van Stijn 85e1aa53ce Add libseccomp requirement for rpm packages
This requirement was originally added in 86f76496ce33bd6eff1737348bc44add4723ddd2,
but got removed in the migration to the new image-based packaging.

Commit f2ceca98823548e401c6cca125b7057df28c4892 added this requirement
back for `.deb` packages, but did not include the same changes for
RPMs.

This patch adds back the requirement for RPM packages as well.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 86ed6eb2cef4e7386979fc73397c1844531eb3a9
Component: packaging
2018-11-28 15:28:34 +01:00
Sebastiaan van Stijn b8014b87d1 Remove remnants from telemetry plugin from Fedora 27, 28
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d91edcf9ae07433110c62ddfbcdb7566fb285a81)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f7b95cb416685d86541f62440927a6613af3cb25
Component: packaging
2018-11-28 13:35:39 +01:00
Eli Uriegas 3cf3a6d8dd Add initial scripts for Fedora 29
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 42f5f2f4384f1699fbe55746d53718016cd6fb87)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6c3958b6ac3633a500d268a8238bd20f636e366d
Component: packaging
2018-10-31 11:29:45 +01:00
Eli Uriegas 23ba2a13ef Change metadata to be stored in docker-engine
People blow away `/var/lib/docker` all the time so we probably shouldn't
store important data there.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 9391057c9472ba24049b8645c251a4c63894522f)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 865140fc4155481b20f694a4528e04e48eb76de4
Component: packaging
2018-09-26 22:33:01 +00:00
Eli Uriegas edf7125231 Use image artifacts as daemon and dependencies
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 944fa7137c02ec56907b26fccfd3a363cd741890)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 6a66a0b6aee6ad2c9c52da728d1e70ce46fec017
Component: packaging
2018-09-21 22:10:36 +00:00
Sebastiaan van Stijn eb465533d3 more updates to package descriptions
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: eb89f3ebd68033fe49b12016ad07f28cfc33d874
Component: packaging
2018-09-20 12:42:43 +02:00
Eli Uriegas 3c71b9d6ac Add native rpm compilation for devicemapper
devicemapper cannot be enabled on a statically compiled binary so we
dynamically compile it on a rhel based distribution in order to enable
devicemapper usage.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 7cb8d358947974abae3e3c346b09523904030609)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: c80ac56dfa393c405c2cd33af94ad6ac1366ece2
Component: packaging
2018-09-17 16:50:09 -07:00
Jose Bigio 00ef8b90e6 Call the engine-.tar target
Also cleans up the target in rpm and deb Makfiles because
the tar target already output a tar.

Signed-off-by: Jose Bigio <jose.bigio@docker.com>
(cherry picked from commit 8a4744f48aa13bea0b4e9174165be4add0a5a42f)
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
Upstream-commit: 8e4a92dc667e2143b6d5707e19c5564b7da46ba1
Component: packaging
2018-09-11 08:42:18 -07:00
Jose Bigio 92c32cb418 Move the tar creation to the image directory
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
(cherry picked from commit eba0ed1f3497ebf25666d96c73c71fde9de98b50)
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
Upstream-commit: 9398be8a7b9ea3907de5c112c329fe3ef1832137
Component: packaging
2018-09-11 08:42:03 -07:00
corbin-coleman d10c52eaae Parameterize Dockerfiles base build images
This will make it easier for anybody to build with a specific version of a distro they want to build on.
They could lock into a specific sha of a docker image if they wanted, as an example.

Signed-off-by: corbin-coleman <corbin.coleman@docker.com>
Upstream-commit: 7afc35b95ac46bfef383788341ddb0b157af14eb
Component: packaging
2018-09-10 16:54:32 +00:00
Eli Uriegas 8644fd23bd Merge pull request #193 from dhiltgen/bump_epoch
[18.09] Bump packaging epoch
Upstream-commit: 346f22eb45a72e6087d0996b4cd5699346c10e74
Component: packaging
2018-09-10 18:41:49 +02:00
Daniel Hiltgen 3082638047 Bump packaging epoch
This should accomodate the new versioning fix

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: be00095e1d0d5674665a63b6e5932178632feb0e
Component: packaging
2018-09-10 08:26:11 -07:00
Eli Uriegas 6069864507 Remove offline installer to install shim-process
Removes the need for the offline installer to install the shim process
and instead installs the shim process as part of the packaging.

May be easier in the future to just package the shim process on it's own
but that'll come after this 18.09 release

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit f8bd366d58f8bdf8a82b9a033353ca5bf4eda948)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 31d0cb047b98ab43f661bd026bdd63deef62543d
Component: packaging
2018-09-10 14:06:32 +00:00
Sebastiaan van Stijn 587ab4033e Bump Go to 1.10.4
Includes fixes to the go command, linker, and the net/http, mime/multipart,
ld/macho, bytes, and strings packages. See the Go 1.10.4 milestone on the
issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.10.4

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 11b4630f4c73885123336b7917cc139c43cf413a)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 3920ea81ea2cab8e1f5f17fb16e133cfb87d9c98
Component: packaging
2018-09-04 08:26:35 +00:00
Andrew Hsu 39bc439e8b add requires container-selinux to spec
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: e4b1c10a6b99b875cd5e37bbfef0b9a6ce58a518
Component: packaging
2018-08-29 04:23:49 +00:00
Daniel Hiltgen 66e16d32fe Make engine scope a build time setting
This should make it easier to change downstream builds
to change the scope.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 72406691244c12d5360889f8658bd4989b588364
Component: packaging
2018-08-24 11:40:42 -07:00
Eli Uriegas b3c9a88509 Do offline bundles for engine installs
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: fe03039776edbc90053b510ae6e72657340b1ccb
Component: packaging
2018-08-20 20:08:07 +00:00
Eli Uriegas 3f276a5ee3 Make ENGINE_IMAGE configurable for dockerd.json
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 657c7899302691373836bbd28fc4c069da64d90e
Component: packaging
2018-08-20 14:59:56 +00:00
Eli Uriegas d0741cffba Make IMAGE_TAG configurable for dockerd.json
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: aabd5d3b852b3b3f7131cdd622a9e5078f193819
Component: packaging
2018-08-18 21:27:35 +00:00
Eli Uriegas 82d8af2891 Make the build variables eval at reference
Makes it so that you can overwrite them better if you include this
makefile in another makefile...

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 446f8d31394ae35fc38187aa5e40627b33a95a27
Component: packaging
2018-08-17 21:22:05 +00:00
Eli Uriegas 26a46ac890 Make the curl for containerd-proxy more resilient
Was reporting 404's using the old url for some reason, might have to
refactor this in the future to just use a git clone...

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 763ad6aa7ac24c269dc1dfa223771671acffc8fc
Component: packaging
2018-08-17 20:25:50 +00:00
Eli Uriegas 126bb1b3a0 Add some changes to make things more configurable
Allows us to switch out debian files and rpm specs on the fly and also
gives us an out to have ARCH specific dockerfiles if we need them for
RPM's. The same strategy can be used for DEB's if need be

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: b72dc2edb8329151bfe2df6989fb329f41e720fb
Component: packaging
2018-08-17 18:33:02 +00:00
Eli Uriegas 9df43900d6 Remove arch specific dockerfiles
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 0fd20b90cd322f0eeb06440833ba119b26f44d05
Component: packaging
2018-08-16 23:50:31 +00:00
Eli Uriegas 4670e93b92 Revive pre / post steps, update offline location
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 558cd9c4bb28a11fe1ff3da45a4efd19265d7ce5
Component: packaging
2018-08-15 23:17:54 +00:00
Eli Uriegas cbb6da8c29 Update to use a base golang image instead of curl
Why didn't we do this the whole time? `¯\_(ツ)_/¯`

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: df2a0d6fc5a59a7a8b352689238eddf5a46d3ed4
Component: packaging
2018-08-15 23:12:28 +00:00
Eli Uriegas 4a4db9a651 Round out systemd for RPM packaging
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: f99ffa4b5ef8c85fa5fbeb8fdc95403f9a02ceaf
Component: packaging
2018-08-15 23:01:10 +00:00