Commit Graph

174 Commits

Author SHA1 Message Date
5c8dc24b07 Don't delete the engine when cleaning
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
Upstream-commit: 16e6737bf2976e83c4c140c95ae69d04905d150f
Component: packaging
2018-08-07 10:22:58 -07:00
7133d76b99 Merge pull request #130 from dhiltgen/revamp_packages
Merged with https://github.com/seemethere/unir
Upstream-commit: a3231d16bd2b7f7a21f9686514617e76bb65cf41
Component: packaging
2018-08-06 18:28:39 +00:00
426d022fb6 Merge pull request #129 from jose-bigio/build_manifest_images
Merged with https://github.com/seemethere/unir
Upstream-commit: 840f3a247d472ce692f1652da60d380613b0298f
Component: packaging
2018-08-06 16:51:23 +00:00
46906a5687 Build docker image with engine binary on multiple arches
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
Upstream-commit: 2dfaf0dd0fa7b7a7aef76d1254b2b48dc04d0211
Component: packaging
2018-08-03 16:32:19 -07:00
d2ad7723be Address review comments on PR #128
Upstream-commit: 0cd6b38d6dbf77a661030303e5cfeb7b26f60d82
Component: packaging
2018-08-02 16:53:29 -07:00
7bd15e7b10 CE package conversion
This splits out the CLI into a discrete package and removes
the engine from the engine package.  Instead the engine
is initialized via a post-inst script using the new CLI UX.
Upstream-commit: 662e248f680eb49a9951a8b34125506b8f82dfed
Component: packaging
2018-08-02 10:01:06 -07:00
f232ca8480 Switch image name on hub
For the Q3 release the names will be refined slightly, and "ce" will no
longer be used - it's now just the docker engine, with "community" or
"enterprise" at the end if disambiguation is needed.
Upstream-commit: e69e4ea4997e468d20d93247ba19cd5e86daf24f
Component: packaging
2018-08-01 08:03:20 -07:00
374a6c3cbc Update nightly builds to use Golang pseudo-version
based on golang's pseudo-version: https://groups.google.com/forum/#!topic/golang-dev/a5PqQuBljF4

> using a "pseudo-version" of the form v0.0.0-yyyymmddhhmmss-abcdefabcdef,
> where the time is the commit time in UTC and the final suffix is the prefix
> of the commit hash. The time portion ensures that two pseudo-versions can
> be compared to determine which happened later, the commit hash identifes
> the underlying commit, and the v0.0.0- prefix identifies the pseudo-version
> as a pre-release before version v0.0.0, so that the go command prefers any
> tagged release over any pseudo-version.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d2baf8f4891e82117bce354e0b0761258a0eafc9
Component: packaging
2018-07-20 00:28:26 +02:00
676377e3f3 Merge pull request #122 from seemethere/remove_artful
Remove Ubuntu Artful (17.10)
Upstream-commit: bfc221bc25df21890d10cc52c54285f1ac0a3392
Component: packaging
2018-07-17 15:26:57 -07:00
78ba8bbfa1 Add support for image build
This adds a new packaging variant for engine with an image
Upstream-commit: 27766ed0f4576ced4026adc60359ad63a977008e
Component: packaging
2018-07-12 10:41:52 -07:00
f481ae9371 ~ -> - for dev versions
tilde doesn't play nice with docker images so to be uniform let's
replace the tilde with a dash

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: ad988a9a4020eaf44245659a8fe7053a2e9b874b
Component: packaging
2018-07-11 00:27:21 +00:00
d35ac81889 Remove Ubuntu Artful (17.10)
EOL is July 2018

https://wiki.ubuntu.com/Releases

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: eb635bdb3044b008344c8318c8d727ac94662526
Component: packaging
2018-07-09 22:18:11 +00:00
d8b48fcc0c Add a 0. to be more consistent with dev version
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: eed5a3519f43d4603cdbc410059d191d9f2c54ea
Component: packaging
2018-07-06 22:21:52 +00:00
981ec3d944 Merge pull request #118 from seemethere/j
Merged with https://github.com/seemethere/unir
Upstream-commit: 680e6a05a1d55d97bcba7b4179a1af5a7526a30d
Component: packaging
2018-07-06 22:01:37 +00:00
90fd78493d Make static versioning match RPM and DEB versioning
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: c2afc0508ba0af6f50e99b9f1756a72748ff2bb1
Component: packaging
2018-07-06 18:45:11 +00:00
7925889650 Bump EPOCH to 1
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 6456000a411bc00fa9f2b022ecda985d1e221869
Component: packaging
2018-07-06 18:23:35 +00:00
8c93c99508 Add unir yml
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 6a5e5179ef2160c98c8e96a82a676703322c24c9
Component: packaging
2018-07-06 18:04:36 +00:00
8dfe97f6a1 Change dev versioning to be purely git based
Switches dev versioning from being based on a set version like
`18.06.0-dev` to being based purely on the git commit timestamp / git
commit sha.

This should give us a bit more flexibility in terms of nightlies not
being tied to specific versions.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 559c9a323a77fe1215f91d851ce72053ce5dd99b
Component: packaging
2018-07-06 17:59:30 +00:00
db488c0706 Remove Debian Jessie for arm64
It's not longer supported since Debian Jessie is now an LTS release as
of June 17, 2018. LTS releases of Debian only support i386, amd64, armel and armhf

Sources:
* https://wiki.debian.org/LTS
* https://wiki.debian.org/LTS/FAQ

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 24f8b422aaed0fba9d0f03bfd5b99c58f0d7f30d
Component: packaging
2018-06-28 13:46:30 +00:00
3d7a0f54f5 Bump Golang to 1.10.3
go1.10.3 (released 2018/06/05) includes fixes to the go command, and the
crypto/tls, crypto/x509, and strings packages. In particular, it adds minimal
support to the go command for the vgo transition. See the Go 1.10.3 milestone
on our issue tracker for details;
https://github.com/golang/go/issues?q=milestone%3AGo1.10.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 65fc4f1c0cc81739df97605f1fbf91dbf2e7739f
Component: packaging
2018-06-11 10:35:39 -07:00
46248afb01 Remove btrfs-progs in favor of libbtrfs-dev
`btrfs-progs` doesn't actually contain the files we need, since we only
need the headers for btrfs, which `libbtrfs-dev` now provides.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 73678285d0671e1b67ec30d21e99cfe1580159fa
Component: packaging
2018-06-01 20:33:59 +00:00
afda389413 btrfs-tools -> btrfs-progs
btrfs-tools is being deprecated in favor of btrfs-progs, will only
matter for debian versions >= buster

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 7c9db958146b66ad59727e8395b928a6e9743642
Component: packaging
2018-05-31 00:04:30 +00:00
de5a705143 Merge pull request #109 from corbin-coleman/golang-as-arg
Set GO_VERSION with a build arg
Upstream-commit: 05cbbc250f5d677ed43546042a38b2eacf45dbe1
Component: packaging
2018-05-22 22:10:56 -07:00
2723d4de1c Remove ENV GO_VERSION
Signed-off-by: corbin-coleman <corbin.coleman@docker.com>
Upstream-commit: 0f1be47e8644032d7c3cfa1762d20ec41a123a0f
Component: packaging
2018-05-22 10:56:53 -07:00
15e10105c8 Remove pigz requirement for CentOS
The pigz binary is used to improve performance when
pulling images, but is not available in the default
CentOS package repositories.

Given that RPM's don't have a "recommends" option,
it's better to remove it as a requirement for now,
instead of failing to install for some users.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: abb1f117d3736fdcbbcc15ecef3e36d1f47c63fa
Component: packaging
2018-05-22 14:56:08 +02:00
0994dbd1ea Set GO_VERSION with a build arg
Use a variable in the Makefile to set the GO_VERSION for the builds.
GO_VERSION is defaulted in all Makefiles as `1.10.2`, but can be set when running make: `make GO_VERSION=1.10.1 deb`.

Signed-off-by: corbin-coleman <corbin.coleman@docker.com>
Upstream-commit: 0fe741746287335a5ba4afaf06be301915324e5a
Component: packaging
2018-05-21 15:58:06 -07:00
e12e0fd6ad Update go to 1.10.2
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 9d2cf19fe46ab7c5c3ff5273b14cae025c5c0849
Component: packaging
2018-05-18 21:28:59 +00:00
b1ae28ae90 Update go to 1.9.6
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: a753f12d5276e8971b0c0e072c7960b7d0ebbb13
Component: packaging
2018-05-18 21:28:44 +00:00
5e0facecb2 Remove Debian Wheezy, EOL 31-05-2018
Debian Wheezy will be EOL on 31-05-2018 per the official documentation,
https://wiki.debian.org/LTS

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 0e45aed95d86bc516b9cd05f3316073e8dda0a0b
Component: packaging
2018-05-17 22:22:04 +00:00
5269a56d32 Merge pull request #106 from seemethere/remove_f26
Remove Fedora 26
Upstream-commit: 4fc747eac9a6828ec94094dac442ba3f72192251
Component: packaging
2018-05-17 15:21:01 -07:00
49df6e1d6f Merge pull request #107 from seemethere/reflect
Make DOCKER_BUILD_PKGS reflective
Upstream-commit: b523944cf7a026b0b674b2580f4c635fb6660e26
Component: packaging
2018-05-17 15:10:11 -07:00
474c06b936 Make DOCKER_BUILD_PKGS reflective
The hardcoded values make it so that we have to update this everytime we
add/subtract something which is sometimes followed/not followed.

This makes it so that we no longer have to update this.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 04ec3b020edc79830c5a0100790f5bb6686d8efc
Component: packaging
2018-05-14 22:42:03 +00:00
27a5d95881 Remove Fedora 26
Fedora 26 will be EOL one month after the release of Fedora 28
(2018-05-01)

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: c638836c18d26c5f7e4602784d6b1c7d13f39904
Component: packaging
2018-05-14 22:37:26 +00:00
830a000faa Remove "experimental" env-vars
Experimental features are no longer a build-time option,
and can be enabled at runtime.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 050b421f4c435c90dc63bb094789b0513689e80c
Component: packaging
2018-05-09 13:16:43 +02:00
f71c487025 Merge pull request #96 from utzb/master
use seccomp for xenial
Upstream-commit: c216602d16cfefdb175cdb902038789b00dd2cef
Component: packaging
2018-04-10 09:31:15 -07:00
0657b91bfc Merge pull request #103 from thaJeztah/bump-golang-1.9.5
Bump Golang to 1.9.5
Upstream-commit: f169b1e43aa26020a6a2a2e09ca3d35371b6c50c
Component: packaging
2018-04-09 15:20:59 -07:00
a72a47a3d9 Bump Golang to 1.9.5
go1.9.5 (released 2018/03/28) includes fixes to the compiler, go command, and
net/http/pprof package. See the Go 1.9.5 milestone on the issue tracker for details:

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

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c62336593118020462d65d4e9784143e07de2da7
Component: packaging
2018-04-04 18:01:28 -07:00
91ed2df48d Add aarch64 builder for debian-buster
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: a42fb6433445b05c1318c9db2b1325bfb50f24af
Component: packaging
2018-04-04 16:59:31 +00:00
bf1e88e279 Merge pull request #98 from seemethere/f28
Add packaging code for Fedora 28
Upstream-commit: 9efc79dd124c6c2a07488e68ddbad1558b8e5e30
Component: packaging
2018-04-04 09:44:21 -07:00
06bbeec2bc Add packaging code for Fedora 28
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 00148a3c994c753a3e171b1aa2b422342e00fd16
Component: packaging
2018-04-03 23:50:57 +00:00
96b3d4192f Add Bionic to README
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 205c26fc9d83bfcb04b39d7b3fb5ae9c1fcbbcc3
Component: packaging
2018-03-30 22:12:42 +00:00
9a9ab34587 Add Ubuntu 18.04 arm64 builds
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: aac8310bbee3c7480487a624756d25d22d53c7dd
Component: packaging
2018-03-29 18:09:08 +00:00
65120ca559 Add building code for Ubuntu Bionic (18.04) LTS
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 460f0b5becbbc5ec2bd341df409af8f06c0a70f7
Component: packaging
2018-03-28 21:53:58 +00:00
d8e4be59e9 use seccomp for xenial
Upstream-commit: 4c02fd87dda048d5d5d7fa6c8bdb8fba04c257c1
Component: packaging
2018-03-23 23:47:58 +01:00
b5921cde4f Don't append number when doing a dev build
Found a bug where a number was being appended to the nightly dev builds
package name causing the latest packages not to be considered as the
latest packages by the package manager.

This makes it so that the nubmer is not included on dev builds.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 63be84fc6ed88847a003dfb32e0dc8bc9126411e
Component: packaging
2018-03-19 22:17:15 +00:00
72a2de1d85 Be less restrictive when moving packages
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 941d99ff6ae57bc06b06b85b7b07210301f454b2
Component: packaging
2018-03-19 21:26:38 +00:00
e4c18f1d24 Merge pull request #91 from seemethere/new_ver_scheme
Enable new test versioning scheme
Upstream-commit: 27d07d7e2dbf81001e402657c0e45c375e73a369
Component: packaging
2018-03-16 11:42:56 -07:00
ca5f3626a1 Allow epoch to be changed by a make variable
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: bf9bb7e74e692a829c2058dbcca81349d7d42005
Component: packaging
2018-03-15 23:34:28 +00:00
f925996d4a Move same parts to common variables
There was a lot of repeated parts in this Makefile, I moved them to a
common variable so that if / when we decide to change how things are run
then it's easy to do so.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: c869c9fcf510d1a6c4e25c1a14ea6cb0bb3e6aa4
Component: packaging
2018-03-15 23:31:46 +00:00
7998309733 Enable new test versioning scheme
Enables the usage of a new versioning scheme for test builds:
* tp -> Technical Previews
* beta -> Beta Releases
* rc -> Release Candidates
* ga -> General Availability Releases

This PR fixes the versioning order for both `deb` and `rpm` packages
when it relates to the new versioning scheme (which may or may not be
used).

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 9ba8e36e8588ea75209d813558c8065844c953a0
Component: packaging
2018-03-15 22:16:30 +00:00