Commit Graph

252 Commits

Author SHA1 Message Date
79bec603a6 Merge pull request #138 from jose-bigio/fix_Makefile_var
Merged with https://github.com/seemethere/unir
Upstream-commit: d7f8fe075d4bd078afbd71e5d29c2f2a3dae4ce7
Component: packaging
2018-08-10 20:19:28 +00:00
1f4ebac506 Fix static version variable
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
Upstream-commit: 507c9f84ccc3f83c978aeefa2f0377ed0c14c3b8
Component: packaging
2018-08-10 13:12:48 -07:00
ae672e2b0e Merge pull request #135 from jose-bigio/top_level_make
Merged with https://github.com/seemethere/unir
Upstream-commit: 0b376627615b15ea2a17b5c97bd7b975b910ea10
Component: packaging
2018-08-07 21:52:06 +00:00
7c303cf2e5 Add top level make target
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
Upstream-commit: 9bb08342efcf1d9e69cbeca9b820309c9622bef5
Component: packaging
2018-08-07 14:28:11 -07:00
2f9ebb742f Merge pull request #134 from jose-bigio/make_image_tars
Add tar targets for engine image
Upstream-commit: d645291be026da9e2aab9906e0d0918d0799c3f3
Component: packaging
2018-08-07 13:47:31 -07:00
13fe238674 Add extra dollar in Makefile/image
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
Upstream-commit: 65a9bb677ebffccb2d5d1002c3e1bdd4dd46d76c
Component: packaging
2018-08-07 13:22:53 -07:00
3570421f62 Remove shell directive so target will work
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
Upstream-commit: 93fcc8443b504c94beaef697ec6f27748b40d656
Component: packaging
2018-08-07 13:21:18 -07:00
d72fa21d55 Add tar targets for engine image
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
Upstream-commit: 2ffde00d61af1074e100ca0c725dbd4f685299a1
Component: packaging
2018-08-07 13:06:47 -07:00
0510b8b031 Merge pull request #133 from jose-bigio/fix_clean
Merged with https://github.com/seemethere/unir
Upstream-commit: 35f96bda01dd7df034a42f606f6aa46a7352e9fc
Component: packaging
2018-08-07 18:07:14 +00:00
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
0185509c33 Merge pull request #128 from dhiltgen/revamp_packages
Merged with https://github.com/seemethere/unir
Upstream-commit: 8756f9830c465471b449ec6b2096d069409a2947
Component: packaging
2018-08-02 22:57:00 +00: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
7359851606 Merge pull request #126 from dhiltgen/image_build
Merged with https://github.com/seemethere/unir
Upstream-commit: 1aa29931980e51171a57cae931de9cd17966dbb0
Component: packaging
2018-08-01 17:28:21 +00: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
cffafa97f1 Merge pull request #125 from thaJeztah/a_nightly_to_remember
Merged with https://github.com/seemethere/unir
Upstream-commit: a5aa7e5a5e7f418cf1bc399055c9700aab475315
Component: packaging
2018-07-20 18:09:14 +00: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
1ea5cae6b3 Merge pull request #123 from dhiltgen/image_build
Merged with https://github.com/seemethere/unir
Upstream-commit: 648a878d637a51826d3d7d17efe8f2f58383daa2
Component: packaging
2018-07-12 17:59:57 +00: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
a5afbc072c Merge pull request #124 from seemethere/tilder
Merged with https://github.com/seemethere/unir
Upstream-commit: 8c000e19fc52ce65f008b0a7ff81871be9367915
Component: packaging
2018-07-11 21:13:35 +00: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
126b4ecc06 Merge pull request #120 from seemethere/k
Add a `0.` to be more consistent with dev version
Upstream-commit: 225a141f3098dda91541f0f193a4a3c88f39f654
Component: packaging
2018-07-06 15:30:07 -07: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
2c5fb6c781 Merge pull request #119 from seemethere/unir
Add unir yml
Upstream-commit: 946d2d4dd2648082955d55cd7f4d8348986a6517
Component: packaging
2018-07-06 14:05:07 -04: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
51cfefca93 Merge pull request #115 from seemethere/remove
Remove Debian Jessie for arm64
Upstream-commit: 4f79760ebf3d659be670d5079574b3fc199f14a0
Component: packaging
2018-06-28 15:49:32 -07: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
3b5238767d Merge pull request #114 from thaJeztah/bump_golang_1.10.3
Bump Golang to 1.10.3
Upstream-commit: 0e26700e872244086288bd45426b37d5734a9ab7
Component: packaging
2018-06-11 10:56:03 -07: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
894a729113 Merge pull request #113 from seemethere/btrfs
Remove btrfs-progs in favor of libbtrfs-dev
Upstream-commit: f1e7523cee9a53295233ba3d0e1fc5cb07ed7913
Component: packaging
2018-06-01 13:44:44 -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
87e0938121 Merge pull request #112 from seemethere/progs
btrfs-tools -> btrfs-progs
Upstream-commit: 7df78c90c9ff96e853f5cd07f7ba0d9c69a55e87
Component: packaging
2018-05-31 13:31:23 -07: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
52fa1b62cd Merge pull request #110 from thaJeztah/remove-pigz-on-centos
Remove pigz requirement for CentOS
Upstream-commit: 4d5e0466854e97ef3a1b6716bc0c09790d3503ec
Component: packaging
2018-05-22 12:49:23 -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
dadd139cae Merge pull request #104 from seemethere/196
Update go to 1.10.2
Upstream-commit: 1aa5fac79de0c2a8116aca3604f76e9dec95f380
Component: packaging
2018-05-18 14:47:52 -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