Andrew Hsu
dbb0b294c6
Merge pull request #81 from seemethere/add_dev_rpm
...
Add dev portion to RPM package version
Upstream-commit: 208ba254d788a0d7bfe4dde92b35b9f2f68aa1d6
Component: packaging
2018-01-22 17:35:16 -08:00
Eli Uriegas
5cec7a6e2f
Add dev portion to RPM package version
...
-dev was being removed, per legacy code, but we'd like to add it back
into the naming so that deb / rpm packages will look mostly the same
when compiled with a `-dev` version.
RPMS end up looking like:
docker-ce-18.02.0.ce-0.0.dev.git20180120.170357.0.fa4fb35.el7.centos.x86_64.rpm
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 65e2c3cf9ff8c3130e628a455e3d02921876cdfc
Component: packaging
2018-01-22 23:10:48 +00:00
Eli Uriegas
739f4e49fc
Merge pull request #79 from seemethere/remove_f25_aarch64
...
Removes fedora 25 aarch64 Dockerfile
Upstream-commit: 44a1f4887d9ac3b6cbb08ab779c9e84109b906ba
Component: packaging
2018-01-22 12:15:43 -08:00
Eli Uriegas
40f1f3c105
Removes fedora 25 aarch64 Dockerfile
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 9f717788b588a48d494abe42d7c392bf8fe458d9
Component: packaging
2018-01-22 19:10:56 +00:00
Eli Uriegas
676b242a5f
Merge pull request #71 from ZeuAlex/rpm_build_aarch64
...
Aarch64 rpm support
Upstream-commit: 4cc70e4be06cd19edfbcdab4619bc3c271a4a04c
Component: packaging
2018-01-18 12:55:53 -08:00
Eli Uriegas
2138e8ddb5
Merge pull request #73 from seemethere/remove_zesty
...
Remove Ubuntu Zesty
Upstream-commit: f8f8219caef8a92c6c87b92377d476af44d76b7c
Component: packaging
2018-01-17 15:12:34 -08:00
Eli Uriegas
d9cc44462d
Remove Ubuntu Zesty
...
Ubuntu Zesty is end of life on January 2018
https://wiki.ubuntu.com/Releases
Signed-off-by: Eli Uriegas <seemethere101@gmail.com >
Upstream-commit: 41086726310e3f78043a4bcf0bcecd5a16d8a144
Component: packaging
2018-01-05 00:02:41 +00:00
Eli Uriegas
9bf811bf85
Merge pull request #74 from seemethere/move_phony
...
Move .PHONY targets above actual targets
Upstream-commit: 41ae603d88e02e950ba4f3e227f9f6e972a3c74b
Component: packaging
2017-12-28 13:58:47 -06:00
Eli Uriegas
f63a46268d
Move .PHONY targets above actual targets
...
Was getting annoying to have to write it into one spot so moved them to
above the targets that they specify.
Signed-off-by: Eli Uriegas <seemethere101@gmail.com >
Upstream-commit: a8e527df5d6579cc53372c26ef86fdcf449aa9ae
Component: packaging
2017-12-28 17:53:59 +00:00
Eli Uriegas
0ba6b0ad15
Merge pull request #72 from seemethere/remove_f25
...
Remove Fedora 25
Upstream-commit: 95eb77209344abe5f29e82ad09ae5ecf7aebe710
Component: packaging
2017-12-28 11:02:42 -06:00
Eli Uriegas
d05eafef63
Remove Fedora 25
...
Fedora 25 was end of life on December 12, 2017
https://fedoramagazine.org/fedora-25-end-life/
Signed-off-by: Eli Uriegas <seemethere101@gmail.com >
Upstream-commit: 920ab84c8c34594be0ebabdac05ebd7710dc6cd0
Component: packaging
2017-12-27 18:12:51 -06:00
ZeuAlex
e1e6adb17e
Build rpms for aarch64
...
Upstream-commit: e204caefd93865ae41a863391b394432130e33fa
Component: packaging
2017-12-20 15:24:30 +01:00
Eli Uriegas
df88bdc9c9
Merge pull request #69 from BSWANG/master
...
replace all '-' in version when generate rpm version
Upstream-commit: abc7613e1b7399b3a8012c00a8a3aaa01e1251fa
Component: packaging
2017-12-18 10:08:29 -08:00
Andrew Hsu
35175d99d5
Merge pull request #70 from seemethere/pass_version_static
...
Pass VERSION to engine static builds
Upstream-commit: 453d9a201fc841ab30ae27246e48f97871b37d95
Component: packaging
2017-12-11 16:15:56 -08:00
Eli Uriegas
5b1b2d3dcf
Pass VERSION to engine static builds
...
VERSION file does not exist anymore for moby/moby so we need to
compensate
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: c411321b8870101c227b03e64930260984c862fd
Component: packaging
2017-12-12 00:07:40 +00:00
bingshen.wbs
cd7f41a503
replace all '-' in version when generate rpm version
...
Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com >
Upstream-commit: 39c434fb36f66803b107ad410dec6b06875bfe97
Component: packaging
2017-12-08 17:47:43 +08:00
Eli Uriegas
376d2e9872
Do not terminate on missing build-ids ( #68 )
...
Do not terminate on missing build-ids
Upstream-commit: 8457a25900698f1bdef844c22fb19900de1a5bc7
Component: packaging
2017-12-07 16:11:20 -08:00
Eli Uriegas
6edf75f3d5
Do not terminate on missing build-ids
...
Relates to an upgrade in `rpm` to `14.4.0`, where missing build-ids now
cause builds to self-terminate. May be needed in other distros if/when
the `rpm` package is updated in those repos.
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: dcd681da54f2c2b2286cc09d053dd6cb865d3f98
Component: packaging
2017-12-07 23:56:30 +00:00
Eli Uriegas
fd25684fc8
Defaults Makefile VERSION variable to 0.0.0-dev ( #67 )
...
When building we should default to a dummy version unless otherwise
specified so we don't get ourselves confused over what is official and
what is not.
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: ffcd040b5c3bd4f81e1d1f11c32f9bb81e235ed1
Component: packaging
2017-12-07 14:25:41 -08:00
Andrew Hsu
cf1d97228e
Merge pull request #65 from seemethere/fix_debian_jessie_aarch64
...
Adds libudev-dev to jessie aarch64 build
Upstream-commit: 6e901d8febcb7c308035952baa760779ab097806
Component: packaging
2017-12-04 16:33:41 -08:00
Eli Uriegas
57c8d64422
Adds libudev-dev to jessie aarch64 build
...
Failed out otherwise:
```
---> Making bundle: dynbinary (in bundles/dynbinary)
Building: bundles/dynbinary-daemon/dockerd-17.09.0-dev
Package libudev was not found in the pkg-config search path.
```
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 4d8e8855d1008f4705ea6db17e5cd5bc90bd2d81
Component: packaging
2017-12-04 23:36:16 +00:00
Andrew Hsu
7287b1b196
Merge pull request #64 from seemethere/jenkinsfile_label
...
Change label to one that actually exists
Upstream-commit: 1991b032cb64827c595ad652e6b94b2e49402527
Component: packaging
2017-12-04 13:49:36 -08:00
Eli Uriegas
a9ea77004e
Change label to one that actually exists
...
Seems `docker-edge` was removed as label on jenkins.dockerproject.org.
This removes that label and just puts the x86_64 label
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 6765382587e31a93b1e65d2d169b00a42d183ee2
Component: packaging
2017-12-04 21:48:42 +00:00
Maartje Eyskens
8f588eed28
Add aarch64 support ( #35 )
...
* add aarch64 support
* use go 1.9 for arm64 support
* fixtypo
* add backports on jessie
* fix path
* delet yakkety
* rm golang-go
* use arm64v8/ images
* fix error made in merge
* remove double architecture
* use arm64v8/
* use go 1.8.5
* Update aarch64 builds to 1.9.2
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 03eac425534002445e666ce0352f1c666151dc89
Component: packaging
2017-12-04 11:53:11 -08:00
Eli Uriegas
31daed866f
Merge pull request #62 from andrewhsu/al
...
no need to detect arch for alpine image
Upstream-commit: 33ee027e04a43651f953bbc080eb020b84fd53cc
Component: packaging
2017-12-01 15:42:51 -08:00
Eli Uriegas
b2d74e0a1a
Merge pull request #63 from andrewhsu/j
...
set VERSION when building packages
Upstream-commit: d467fd1d6abc13be714896f89218a8e6ca047162
Component: packaging
2017-12-01 15:42:33 -08:00
Andrew Hsu
395b31b896
no need to detect alpine image
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 1b5ac32b06cb05ee61ea1b72e2147e983194ea73
Component: packaging
2017-12-01 15:39:00 -08:00
Eli Uriegas
7534a636c1
Merge pull request #60 from andrewhsu/192
...
use golang 1.9.2
Upstream-commit: ca48d4109ee2326ed16bbcedfdd8691747b252ab
Component: packaging
2017-12-01 15:35:18 -08:00
Andrew Hsu
469adac6a0
set VERSION when building packages
...
Setting to something that will not be confused with a version number
that will ever be released. Also, this is required for the deb packages
to build properly
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 0de78bd1251958a9d8916c3944b8f51d0ffb49b7
Component: packaging
2017-12-01 15:19:41 -08:00
Andrew Hsu
9b80ff5665
use pre-compiled golang arm64 toolset
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 30c250b285e758b295e010eee64b726cdac0e7be
Component: packaging
2017-12-01 14:56:19 -08:00
Andrew Hsu
29875cbb85
use golang 1.9.2
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 0c04ba6701d462b173ed63bdcd9a55c0e95d8ce1
Component: packaging
2017-12-01 13:59:10 -08:00
Andrew Hsu
f1232b72bc
Merge pull request #61 from seemethere/fix_jenkinsfile
...
Make Jenkinsfile actually function
Upstream-commit: b53c9642495f3c09e2c95791ab6108fe8733fe2b
Component: packaging
2017-12-01 13:58:39 -08:00
Eli Uriegas
3cd9275696
Make directory references absolute
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: bca63242a9c166a944619019da6e0b50f03b4233
Component: packaging
2017-12-01 21:52:00 +00:00
Eli Uriegas
b63d8b8465
Remove fancy github context notifiers
...
They don't function correctly and they're not worth it
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 3f5a6f288ad7e134abb4ac99e56cbbca17bfae88
Component: packaging
2017-12-01 21:47:49 +00:00
Andrew Hsu
e57d9082bb
Merge pull request #57 from seemethere/add_tests
...
Adds initial Jenkinsfile
Upstream-commit: 20ac959f7f135b20c45b56d8dd50353a0e3a5e52
Component: packaging
2017-12-01 13:17:46 -08:00
Eli Uriegas
5b5e980ec3
Adds initial Jenkinsfile.
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 31a08611f6b87f71d673ab254471826eed225858
Component: packaging
2017-12-01 21:16:46 +00:00
Eli Uriegas
c9b8719b0b
Merge pull request #59 from seemethere/add_f27
...
Adds packaging for Fedora 27
Upstream-commit: 3519a3532cf9da379db073452a3f55c7d894961a
Component: packaging
2017-11-21 09:39:51 -06:00
Eli Uriegas
8b37566333
Adds packaging for Fedora 27
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: ca096b9620cf1d8c1d0a34f052e3a3d33840fab3
Component: packaging
2017-11-14 19:13:47 +00:00
Eli Uriegas
8126d722b0
Merge pull request #55 from seemethere/add_artful
...
Add Ubuntu 17.10, Artful
Upstream-commit: 7b2f5e75e1b30ab70bee294e0215f399ffe32d25
Component: packaging
2017-10-31 13:19:41 -07:00
Eli Uriegas
5e3a8a19fe
Update to 1.8.5
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: c16053e90143cd8a9a559b749407d938f0cb4456
Component: packaging
2017-10-31 11:22:44 -07:00
Andrew Hsu
cf57f4873b
Merge pull request #58 from thaJeztah/bump-golang-to-1.8.5
...
Bump Golang to 1.8.5
Upstream-commit: 798ac05bb417d6f51fba3da55d1b9a9c7b686d61
Component: packaging
2017-10-31 11:22:37 -07:00
Sebastiaan van Stijn
f9bbb79bc5
Bump Golang to 1.8.5
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f7e22edc5125feab9887cf6cd6b94a153a88ed89
Component: packaging
2017-10-31 18:57:28 +01:00
Andrew Hsu
7fe5d41e3a
Merge pull request #53 from thaJeztah/bump-golang-to-1.8.4
...
Bump Go to 1.8.4
Upstream-commit: 18b39977570d17368c9d03e862e0ce264f7ef082
Component: packaging
2017-10-31 10:54:14 -07:00
Eli Uriegas
e18e9addc6
Add Ubuntu 17.10, Artful
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 1468941a50dba7e0a82a01cb938338041f028ef9
Component: packaging
2017-10-20 11:46:49 -07:00
Sebastiaan van Stijn
24d0fa40df
Bump Go to 1.8.4
...
Bumps the Go version used to 1.8.4, which contains
security fixes; https://groups.google.com/forum/#!topic/golang-announce/1hZYiemnkdE
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9f50d4449ab79e467e7c2a2a498bf00ebd9db48c
Component: packaging
2017-10-14 23:26:31 +02:00
Andrew Hsu
24531cb28a
Merge pull request #54 from seemethere/change_ubuntu_trusty_package_mirror
...
Switches ubuntu trusty mirror to one that works
Upstream-commit: e2507465495d5361fe9501a5f5e7172779a67e63
Component: packaging
2017-10-10 10:21:32 -07:00
Eli Uriegas
69522bfabb
Switches ubuntu trusty mirror to one that works
...
Was getting 404's with the old one, consider this one temporary until
canonical fixes their stuff.
Related:
https://bugs.launchpad.net/cloud-images/+bug/1711735
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 8e177368d0a30614a7ba615f3c2f2ede1e21ff8e
Component: packaging
2017-10-10 10:19:03 -07:00
Eli Uriegas
d7b8803737
Merge pull request #50 from thaJeztah/add-debian-buster
...
Add builds for debian buster
Upstream-commit: a7630bdc8bb0a5928174675d4948a437eaf4849e
Component: packaging
2017-09-30 13:38:22 -07:00
Eli Uriegas
347269ee44
Merge pull request #52 from thaJeztah/switch-to-arm64v8
...
Switch aarch64 images to arm64v8
Upstream-commit: a1debdbcf0220c10799fce225f2f189e681de385
Component: packaging
2017-09-15 18:54:10 -07:00
Eli Uriegas
19d23646ea
Merge pull request #51 from thaJeztah/switch-to-arm32v7
...
Switch armhf images to arm32v7
Upstream-commit: dfb5b129949527991b6ef9fa1d82c1a8a3f412eb
Component: packaging
2017-09-15 18:53:37 -07:00