Commit Graph

425 Commits

Author SHA1 Message Date
2bbeb0d006 Always create apt-ftparchive.conf.
The Releases file(s) and other bits for EOL-ed distros such as Ubuntu
Vivid should remain untouched when we are releasing debs.

However, few files in https://apt.dockerproject.org/repo/dists/ubuntu-vivid/
were being updated for the docker 1.10 release including the Release files.
This is due to apt-ftparchive generating index files for vivid as well,
due to the stale apt-ftparchive.conf

This change always creates config using suites in contrib/reprepro/suites.sh.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 204c7808f94259a32f1e89c229116977876cbb88
Component: engine
2016-02-23 16:06:43 -08:00
f62b97e499 Fix some typos in comments and strings
Most of them were found and fixed by codespell.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Upstream-commit: 2eee613326fb59fd168849618d14a9054a40f9f5
Component: engine
2016-02-22 20:27:15 +01:00
9111f0c18a Fix index generator for apt/yum packages
Some @_@ characters could become visible if filename is longer than 44
characters.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 7acd3987d3d55e950ada47b41bb89ccb12b539cb
Component: engine
2016-02-16 21:54:07 -05:00
d67c9f367d Only relabel /var/lib/docker on initial install
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: 443ada574da41f20cdd3708e2dee3091dd363afb
Component: engine
2016-02-16 08:27:59 -05:00
4fe2cef6bb dont clean the db
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 477e1fc989dd9a58d7bee78d6bf13e5a24ebd4d6
Component: engine
2016-02-12 13:13:50 -08:00
697a990701 fix common misspell
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 99a396902f0ea9d81ef87a683489b2435408f415
Component: engine
2016-02-11 15:49:36 -08:00
e18dc87631 Merge pull request #20114 from jfrazelle/fix-release-script
get os arch for release script
Upstream-commit: 2a64d400b34e53f38b210a4ca23ea202c9246a7f
Component: engine
2016-02-11 17:28:23 -05:00
47f5776cce Improve remote integration-cli tests
Progress toward being able to run integration-cli campaign using a
client hitting a remote host.

Most of these fixes imply flagging tests that assume they are running on
the same host than the Daemon. Also fixes the `contrib/httpserver` image
that couldn't run because of a dynamically linked Go binary inside the
busybox image.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: a943c401509e7994ae5c574a4b7e23354e44a105
Component: engine
2016-02-11 07:31:49 -08:00
6ae6421b5c Merge pull request #20158 from cpuguy83/carry_19504
Dockerfile,contrib,hack: remove buildpack-deps
Upstream-commit: fa860c86ff0a368e686535c2689d1099fa9ea7a2
Component: engine
2016-02-09 14:58:37 -05:00
1a2b70c103 use debian:jessie for ensure-syscall-test
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 7c9e9afeb78ad3265c2ec5d4c6969c0d6182af2b
Component: engine
2016-02-09 13:13:38 -05:00
cb9f693ca8 add validation for generating default secccomp profile
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 9bc771af9d09026111916191394eb2896608eb59
Component: engine
2016-02-08 13:04:52 -08:00
e47678e267 get os arch for release script
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 26da52d4a5ae101c638ea5b093f7262a744251f0
Component: engine
2016-02-08 10:57:04 -08:00
bce1c13026 Dockerfile,contrib,hack: remove buildpack-deps
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 49a45d80f26ceb963a00428522ff485fd9f9afdc
Component: engine
2016-02-04 20:22:34 +02:00
4506ff3119 improve test-deb-install
This PR adds support for using the DOCKER_BUILD_PKGS env var to
better help defining what packege to build. It also adds support
for the integration-daemon so we can run it as a bundle.

Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>

add directory test

Adds missing directory test. This helps verifying that
DOCKER_BUILD_PKGS is a directory and exists before continueing.

Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>

fix indent

Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>
Upstream-commit: 620b8250e85abbe284eb8d34799df1bb73d82d6a
Component: engine
2016-02-04 18:14:08 +01: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
0063d9bddd Merge pull request #19735 from jfrazelle/add-repo-scripts
add scripts to clean experimental rpms and debs
Upstream-commit: c006c0261159224675397162aa3a03d9adbb180b
Component: engine
2016-01-29 15:52:18 -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
f35ef7f96a add scripts to clean experimental rpms and debs
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 9ca8386c5720d887f6c22b657324e9fc6ff2487d
Component: engine
2016-01-27 15:54:53 -08:00
259365d60a Add DOCKER_BUILD_GOGC to tweak GOGC for compile
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 9672afa3391119b3b06d87735041168b01b7f1da
Component: engine
2016-01-27 13:35:26 -05: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
aa78ebdfe7 Merge pull request #19013 from hqhq/add_support_docker_aarch64
Add support for build and test docker on arm64
Upstream-commit: b5420be597ea9ce6a0ea7f544a141711289cd3da
Component: engine
2016-01-26 10:33:48 -08:00
4edafc3bc1 *: purge dockerinit from source code
dockerinit has been around for a very long time. It was originally used
as a way for us to do configuration for LXC containers once the
container had started. LXC is no longer supported, and /.dockerinit has
been dead code for quite a while. This removes all code and references
in code to dockerinit.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
Upstream-commit: 4357ed4a7363a1032edf93cf03232953c805184f
Component: engine
2016-01-26 23:47:02 +11:00
fba580f28b Merge pull request #19146 from mikedougherty/cs-105-download-script
Create a bundle for the install script to support other domains
Upstream-commit: 21ec6d3789b93aad5788785cf4be4a2445044375
Component: engine
2016-01-22 09:25:24 -08:00
d0c4b1bf31 Create a bundle for the install script to support other domains
For the CS Engine we need to have an install script like OSS does, but
the locations are all different, as is the GPG key used. This is
accomplished here by slightly altering the script itself and adding a
simple 'sed' based bundle for make.sh.

This install script is used in to change the URLs instead of sed in
release.sh.

Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
Upstream-commit: 51dad1185a8dcf55f2e3473b79748e0e72c6590c
Component: engine
2016-01-21 20:42:20 -08:00
128e0a1c5a Merge pull request #19423 from jfrazelle/apparmor-no-install
disable install of docker-engine for 1.10, try to get ready for 1.11
Upstream-commit: 7d19ca7c40bc2b5172854ce073a6d11175027d82
Component: engine
2016-01-21 12:08:50 -05:00
bc39a3fed6 Merge pull request #19377 from jfrazelle/cleanup-build-rpm-deb
Cleanup build rpm deb
Upstream-commit: 5537a92e450ea56e2002f83ff50bb70fdb2cc25e
Component: engine
2016-01-20 23:58:33 -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
d08e97ec27 Merge pull request #19196 from Microsoft/jjh/tp4ci
Windows CI: Setup for testing against Windows
Upstream-commit: 637f49b5af6ac61cce6fadc4a3b8264ec14ca29b
Component: engine
2016-01-18 15:22:08 -08:00
4562635fa9 disable install of docker-engine for 1.10, try to get ready for 1.11
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: c4bc9657b9e52f12b37aa36da15c1a2eb86519a3
Component: engine
2016-01-18 13:38:29 -08:00
d8a8275332 Merge pull request #19169 from Djelibeybi/fix-ol6-build
Restoring the RPM build process for Oracle Linux 6
Upstream-commit: b69243e951a9845c3bd3e718452865c2753b7a0c
Component: engine
2016-01-15 16:56:11 -08:00
d3d0a35112 Merge pull request #19340 from Microsoft/jjh/rsrcfix
Windows: Remove linkmode internal hack
Upstream-commit: 790e648c0613e435be56727e1ebbdc0ccf8aeb56
Component: engine
2016-01-15 14:10:56 -08:00
4030bbc684 Add support for build and test docker on arm64
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 66d24c2b44a076a6dda17dabe028da9acaa55deb
Component: engine
2016-01-15 14:25:03 +00:00
2365ad5675 Switch "syscall-test" image from "debian:jessie" to "buildpack-deps:jessie" so that "gcc" is already included
This results in a significant time savings during repeated builds (since we don't have to re-download gcc for every test run).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 9b2aab3fc85ab1d8cf7479b153e54d5dcceb7886
Component: engine
2016-01-14 13:51:30 -08:00
f048e88551 Windows: Remove linkmode internal hack
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6ca5a2c476f548b55d68daa4264b4ef9e6c2696d
Component: engine
2016-01-14 13:09:28 -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
e4291809ce Not having a changelog is bad RPM etiquette.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: 22af8dfb14d7cc9eb91964ed187a074658f57005
Component: engine
2016-01-14 10:34:48 +11:00
d54137b176 Make Makefile work on OS X
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: df40c61f8ae43349b7504509e8d004f86175c862
Component: engine
2016-01-11 18:16:56 -05:00
342fdb78fb Windows CI: Setup for testing against Windows
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a4b77dc1af0f4abda3696c35976b72322d7f409f
Component: engine
2016-01-11 11:52:03 -08:00
5cfea6b0eb Merge pull request #19076 from tianon/multiarch
Refactor multi-arch support (especially for new mostly-official multi-arch official images)
Upstream-commit: 2d5ca742eb54e077861a29f201eb8fa38359cb1b
Component: engine
2016-01-11 13:25:55 -05:00
15e94930a8 Merge pull request #19138 from Microsoft/jjh/failedtodockerversion
Windows CI: More debugging
Upstream-commit: ad2966a3159514620c2dc36d8e7fdcee948e8468
Component: engine
2016-01-10 18:11:19 -08:00
6c33dca6bb Make .ensure-syscall-test to use build-arg
.ensure-syscall-test need to build an image, we have
to add http_proxy and https_proxy to make it work.
Inseted of adding http_proxy and https_proxy env to the Dockerfile,
adding a DOCKER_BUILD_ARGS env to pass the build-arg is much more
elegant.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 3ff67256132febad4d039845e97db2ad4d55025d
Component: engine
2016-01-08 15:27:21 +08:00
8a5de1f3ad Add missing ? to specfile variable.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: c64f9407a4833bcaf34f766378512dd79f47d75f
Component: engine
2016-01-08 11:06:21 +11:00
3293844ab5 Restoring the RPM build process for Oracle Linux 6 and updating the docker-engine.spec
file to require the Unbreakable Enterprise Kernel Release 4 on both Oracle Linux 6
and Oracle Linux 7.

The UEK R4 provides the required kernel functionality for VxLAN support
required by Docker 1.9 and user namespace support required for 1.10+.

The build of Docker on Oracle Linux 6 requires some manipulation of the build
environment so that the CGO compiler uses the UEK R4 headers instead of the old
default kernel headers.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: 28f52bd06a24705bd6958ac505b6b6f36e877547
Component: engine
2016-01-08 08:09:47 +11:00
40d1466ce7 Add a validate-vendor script
Makes sure that if ./hack/vendor.sh has been updated, it has been used
to update the vendor folder.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4c22c566e25ff2bc6fa80cd9627c59512a1f768d
Component: engine
2016-01-07 19:57:50 +01:00
819eda8142 Refactor multi-arch support (especially for new mostly-official multi-arch official images)
See 99433d2ca2/README.md (architectures-other-than-amd64) for some context of where these images come from.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 91201678c6f58a5e46fe302bed9eb55a7ddcf693
Component: engine
2016-01-06 14:34:29 -08:00
8f5518d38a Windows CI: More debugging
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 676118670dd0be7781dfd0c12072efc62c53f1bb
Component: engine
2016-01-06 11:44:07 -08:00
cf47068ecd Windows CI: No integration daemon stop
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a3858873fa87ff5b209e89e70d127d822efc42a6
Component: engine
2016-01-05 10:52:59 -08:00
907be2c8ba Remove hello-world:latest tag before integration
This is to make sure we are in the same state on linux/arm, linux/… and
other architecture.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 0736598b93d7bc94b376c61ada17658dddee9aa3
Component: engine
2016-01-05 14:40:27 +01:00
902a67f4ef add more seccomp profile tests
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 327421d1df557e156b29d14359a2bfdc59cfb46f
Component: engine
2015-12-30 17:30:44 -08:00
b985b8195a cleanup jess/unshare image
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 626c933730cffb6ca9112271dc4df5a1e462cac1
Component: engine
2015-12-30 16:20:05 -08:00