Commit Graph

35 Commits

Author SHA1 Message Date
ec2663feb9 Convert script shebangs from "#!/bin/bash" to "#!/usr/bin/env bash"
This is especially important for distributions like NixOS where `/bin/bash` doesn't exist, or for MacOS users who've installed a newer version of Bash than the one that comes with their OS.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 52379fa76dee07ca038624d639d9e14f4fb719ff
Component: engine
2017-02-13 11:01:54 -08:00
3b675a4101 Add missing ${DOCKER_BUILD_ARGS}
Add missing "${DOCKER_BUILD_ARGS}" for building rpm with `docker build`,
this is quite important when running `make rpm` behind http proxy.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 062ce13e9cc6a9eb8ea8ae6333ff1dcc915572c4
Component: engine
2017-01-17 20:10:48 +08:00
64d7644ec8 Replace grimes with tini
There is no reason to duplicate efforts and tini is well built and
better than grimes.  It is a much stronger option for the default init
and @krallin has done a great job maintaining it and helping make
changes so that it will work with Docker.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: d58b47623b252803f5cd12f6d9ca584d1587ab22
Component: engine
2016-11-08 14:42:54 -08:00
30520bd0c0 project: fix build rpm
* change workdir for accessing install-binaries.sh
* use other gopath for binaries to preserve sources
* add sources of proxy and grimes to rpc spec
* use dynamic proxy with -linkmode external in deb and rpm

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: bf0fe87fe6acb0ad55539fdfa565dcdca8e343a5
Component: engine
2016-10-28 14:34:17 -07:00
ea2938292a Merge pull request #27519 from justincormack/proxy-build
Build docker-proxy from git checkout like other external binaries
Upstream-commit: 36f47aa2527f83d7ca7254c43eb08ffc5ce1102e
Component: engine
2016-10-25 08:54:13 -07:00
44e77a4b4f Build docker-proxy from git checkout like other external binaries
This means we can vendor libnetwork without special casing, and
it is built the same way as the other external binaries.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 3996975b0840033bda3919440d122d734a4bc66b
Component: engine
2016-10-25 13:13:22 +01:00
9a299b360f Make experimental a runtime flag
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 7781a1bf0fef748877326632b88e92fbf3c90daa
Component: engine
2016-10-24 15:20:01 -07:00
e50d97d8c8 project: unify way of installing runc and containerd
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 179479c6cdf44a2fd3d4ba2ce5dc176bc22ca9bf
Component: engine
2016-10-20 08:50:02 -07:00
75e7ddadb0 project: move go binaries installation to separate script
It should allow easier updates for containerd and runc

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 1b41125ad9f1a3881b71bd044d76fd285170addb
Component: engine
2016-09-23 09:21:29 -07:00
fa68c3585a Add selinux policy per distro
This adds the ability to have different profiles for individual distros
and versions of the distro because they all ship with and depend on
different versions of policy packages.

The `selinux` dir contains the unmodified policy that is being used
today.  The `selinux-fedora` dir contains the new policy for fedora 24
with the changes for it to compile and work on the system.

The fedora policy is from commit
4a6ce94da5

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 32b1f26c5111b22fe4277879c4f5e4687a6a72fc
Component: engine
2016-08-04 14:29:22 -07:00
d66614a605 Require manpages for packages.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 1ea9c19ffe53811931ecd3102703c3eacb22d14c
Component: engine
2016-07-22 16:34:46 -04:00
01be8b95e0 Make manpages in a conatiner.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 7004f219f5d0fe99de0dadf319381d224866eb7c
Component: engine
2016-07-22 16:32:51 -04:00
9ed298d21b Add a script to generate man pages from cobra commands.
Use the generate.sh script instead of md2man directly.
Update Dockerfile for generating man pages.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 00a8a40398263429f99b1a5f0be59048e1c6f38d
Component: engine
2016-07-19 12:00:21 -04:00
f9129f7641 Merge pull request #22236 from kencochrane/remove_git_from_rpm
Exclude .git directories from the source RPMS and debian packages
Upstream-commit: 4531c01509602a6be3741d1999fc2f5b77c16718
Component: engine
2016-05-06 11:16:12 -07:00
d72bbfcb65 Update build-deb to make correct use of DOCKER_BUILD_PKGS
An environment variable cannot directly be used as a bash array, this
patch loops through all the IFS separated value (which default to
space) instead.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 20e1b9593ee1d23c5df7c78903d27a72cee711e8
Component: engine
2016-05-02 11:22:01 -07:00
aafad00038 Exclude .git directories from the source RPMS
Ignore .git directory when creating debian sources

Added missing DOCKER_GITCOMMIT env variable to build-deb

Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
Upstream-commit: f1ad6f127bf83dfd549166120d16fceea7c9b3e6
Component: engine
2016-04-26 09:26:32 -04:00
eecbb6fc3c Use https for git clone in build
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a7e9bf6cb70117005dbcd4a987a7f30e3c605656
Component: engine
2016-03-29 09:35:42 +02:00
7e9cc10806 Packaging changes required for new containerd binaries
These are the changes required due to the new binaries that containerd introduced.
The rpm, and deb packages now include 5 binaries.

docker, containerd, containerd-shim, ctr, and runc

The tar files also include all 5 binaries.

Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
Upstream-commit: bb66d7144f7d0a617f5985486ae36bbbaa5461ba
Component: engine
2016-03-24 16:25:33 -04:00
455910471d fix opensuse rpm
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 1cbd77262987d821a675f51da1213c7bf171e05b
Component: engine
2016-02-03 10:34:17 -08:00
9512e36135 add support for building first ARM debian package
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com>
Upstream-commit: 7b31ed432ee2fa95938d64dc76c982e52cd00330
Component: engine
2016-01-29 00:21:17 +01:00
f352b24e50 Adjust version string processing for RPM build
This will only trim off the last '-' separated token to be checked for
RC status. This allows including a 'cs#' token in the version string.

Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
Upstream-commit: 04100233679124a2d0b6c622cec81954f3aaf38d
Component: engine
2016-01-26 11:49:59 -08:00
2a3e0a22a4 add a way to only build requested pkgs
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 0bff2515f74fc6f0be9f019cc8b0f08b50e36228
Component: engine
2016-01-19 17:47:27 -08:00
985a9b7b1d Remove the changelog auto-generation because its hardcoded in the .spec file now.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: b916d451325fc20d754f47702af34304e983a77b
Component: engine
2016-01-14 18:50:55 +11:00
61fe2fe7ce Add DOCKER_BUILD_ARGS env to pass build-arg for building deb and rpm
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 82051ab996910993c655fe2551fc84df592c4b81
Component: engine
2015-12-29 04:09:44 -05:00
29a743c21a Rename -dirty to -unsupported
Nightly and unofficial builds of Docker bear the suffix `-dirty` in the
version string. Change this suffix to `-unsupported` to make it explicit
that no support will be provided on such versions, and that it is for
example unnecessary to file an issue for it.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 3e298c5928d0a2cbf5e1b374783ce59de2076637
Component: engine
2015-12-24 09:11:49 -08:00
b843dca39f fix experimental boolean macro
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 38724c80ab32d5d578029f19a1b443341ff3aaf4
Component: engine
2015-11-14 14:47:13 -08:00
08e6893ada update debs/rpms for pkcs11 yubikey things
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: cf4c3da725e5c923b637a0dbea3d20064286f008
Component: engine
2015-11-13 13:20:53 -08:00
cd15fca4ed Generate a full RPM changelog from the existing CHANGELOG.md file
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: 1374ebcde0e936bc687b6b05373e7d2b412baba2
Component: engine
2015-09-25 17:25:00 +10:00
0b5d2a0494 add opensuse to rpm builder
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: b0d4e9d1ba0dec9c43ae212ce10b509da9a05919
Component: engine
2015-09-15 16:18:19 -07:00
121bb4177c add selinux-policy and docker-engine-selinux rpm
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 8fe675d7992cd44281669e40a33d239dfe8e97e1
Component: engine
2015-08-28 17:54:04 -07:00
81c6019b8c pass DOCKER_EXPERIMENTAL into build images
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 76d6751600fe91424171b886fdd87fb3eb3a1380
Component: engine
2015-07-23 09:42:22 -07:00
84b8fc6fe1 Moving man pages out of docs
Adding in other areas per comments
Updating with comments; equalizing generating man page info
Updating with duglin's comments
Doug is right here again;fixing.

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: eacae64bd89ccc95a6db7bda76d36014e71e70ac
Component: engine
2015-06-10 13:43:35 -07:00
77c62581e8 Swap build-* to use UTC instead of local time
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: aa54a93f749e2048957eb28e6045770672cb8838
Component: engine
2015-06-03 09:56:46 -07:00
c50b83a729 Make "DEST" a make.sh construct instead of ad-hoc
Using "DEST" for our build artifacts inside individual bundlescripts was already well-established convention, but this officializes it by having `make.sh` itself set the variable and create the directory, also handling CYGWIN oddities in a single central place (instead of letting them spread outward from `hack/make/binary` like was definitely on their roadmap, whether they knew it or not; sneaky oddities).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: ac3388367b6493987cef8017774fa4cdb5d2098f
Component: engine
2015-05-30 11:16:43 -07:00
0017c3b28a Add rpm for centos-6, centos-7, fedora-20, fedora-21
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 18beb5561140aaa950f00391a87bb332fb2b6aea
Component: engine
2015-05-05 16:05:30 -07:00