Commit Graph

1363 Commits

Author SHA1 Message Date
Justin Cormack
9fdf1d57a1 Merge pull request #604 from rneugeba/kern-doc
doc: add a note on building debug kernels
2016-10-11 19:26:01 +01:00
Rolf Neugebauer
3c941ede21 doc: add a note on building debug kernels
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-10-11 18:16:06 +01:00
Justin Cormack
8191e3204e Merge pull request #603 from justincormack/minus-j
set -j on kernel build again
2016-10-11 17:27:17 +01:00
Justin Cormack
e7b9428589 set -j on kernel build again
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-11 16:27:55 +01:00
Justin Cormack
18a55e64f5 Merge pull request #601 from justincormack/ipsec
Add more network and crypto modules including enough for ipsec
2016-10-11 16:26:04 +01:00
Justin Cormack
6e4da7f108 Merge pull request #602 from justincormack/no-no-prune
do not remove build containers
2016-10-11 16:21:34 +01:00
Justin Cormack
cfbdc7d067 do not remove build containers
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-11 16:12:40 +01:00
Justin Cormack
c66ce62266 Add more network and crypto modules including enough for ipsec
CRYPTO_ECHAINIV took the longest to find, which is needed.

Fix #598

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-11 16:04:05 +01:00
Justin Cormack
b951a26a3a Merge pull request #596 from justincormack/automount-sort
Sort block devices
2016-10-10 15:17:12 +01:00
Justin Cormack
5f74483a32 Sort block devices
See #589 for discussion.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-10 15:09:54 +01:00
Justin Cormack
1b529e5763 Merge pull request #589 from nathanleclaire/azure_recent_fixes
Fixes for Azure hostname and swap disk
2016-10-10 15:08:30 +01:00
Justin Cormack
f16cfb94c9 Merge pull request #595 from justincormack/nolatest
Do not create latest tags for base images
2016-10-10 15:07:02 +01:00
Justin Cormack
0ac6beff82 Do not create latest tags for base images
As we never use these, do not create them.

Also update images where applicable.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-10 14:55:48 +01:00
Justin Cormack
007a4cab96 Merge pull request #593 from justincormack/kernelup
Update Linux to 4.4.24
2016-10-10 14:30:06 +01:00
Justin Cormack
a68ad29880 Update Linux to 4.4.24
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-08 13:48:29 +02:00
Justin Cormack
4ac1d5ca26 Merge pull request #591 from justincormack/dockerup
Update docker to 1.12.2-rc3
2016-10-08 13:46:44 +02:00
Justin Cormack
cbf40afd8b Update docker to 1.12.2-rc3
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-08 13:00:15 +02:00
Nathan LeClaire
962f8a4ac9 Fixes for Azure hostname and swap disk
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-10-06 14:40:11 -07:00
Justin Cormack
5217107fa4 Merge pull request #586 from justincormack/overcommit
Support memory overcommit
2016-10-05 12:54:35 +02:00
Justin Cormack
bada078db2 Merge pull request #585 from justincormack/kernelup
update kernel to 4.4.23
2016-10-05 11:47:38 +02:00
Justin Cormack
68da2c2a49 Support memory overcommit
One less complaint in Redis startup.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-05 11:46:58 +02:00
Justin Cormack
8de1b3d040 update kernel to 4.4.23
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-01 21:03:47 +01:00
Justin Cormack
a1e4820ca0 Merge pull request #584 from justincormack/kernel-fixes
add ncurses to C build for menuconfig
2016-10-01 21:01:50 +01:00
Justin Cormack
e1454f0249 add ncurses to C build for menuconfig
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-01 18:26:38 +01:00
Justin Cormack
a844cf4294 Merge pull request #581 from justincormack/cache
remove use of rm /var/cache/apk
2016-09-29 21:13:40 +01:00
Justin Cormack
e145d8268b Merge pull request #580 from justincormack/quiet
Use build container id rather than tagging builds
2016-09-29 21:11:25 +01:00
Justin Cormack
6c00b85e53 remove use of rm /var/cache/apk
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-29 21:04:16 +01:00
Justin Cormack
fa19d3259b Use build container id rather than tagging builds
This means that multiple builds will not conflict, so we can
remove the lock from the CI. Also quieter when no errors.

Some still left to do, only done the ones used in build and CI
initially. Some of the others will be cleaned up anyway later.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-29 20:21:17 +01:00
Justin Cormack
6fb163c2a5 Merge pull request #576 from justincormack/alpine-aufs-build
Use patched aufs-utils so can compile kernel with alpine
2016-09-29 16:42:21 +01:00
Justin Cormack
0214c41ff3 Use patched aufs-utils so can compile kernel with alpine
This is going to be submitted upstream.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-29 16:17:46 +01:00
Justin Cormack
6781379543 Merge pull request #575 from justincormack/dockerup
update Docker to 1.12.2-rc1
2016-09-28 08:59:41 +01:00
Justin Cormack
35b58b9290 update Docker to 1.12.2-rc1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-28 08:51:07 +01:00
Justin Cormack
77ca9f2b61 Merge pull request #574 from justincormack/rc-checking
Fix code for downloading Docker for release candidates
2016-09-27 22:31:59 +01:00
Justin Cormack
8a8ac34a68 Merge pull request #573 from nathanleclaire/azure_nev
Propagate AZURE_STG_ACCOUNT_NAME in build container
2016-09-27 22:27:50 +01:00
Justin Cormack
0d08098b09 Fix code for downloading Docker for release candidates
These always need to be downloaded with curl.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-27 22:26:29 +01:00
Nathan LeClaire
201e806d53 Propagate AZURE_STG_ACCOUNT_NAME in build container
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-09-27 13:38:26 -07:00
Justin Cormack
55444549cd Merge pull request #558 from justincormack/nosyslinux
Remove syslinux from base image
2016-09-27 11:45:36 +01:00
Justin Cormack
0abcf36f2a Remove syslinux from base image
Only needed for build, so save space and avoid security scan errors.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-27 11:23:54 +01:00
Justin Cormack
d11a882233 Merge pull request #565 from justincormack/opensslup
openssl security update
2016-09-27 10:55:11 +01:00
Justin Cormack
c8da76aa02 openssl security update
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-27 10:15:50 +01:00
Justin Cormack
aaf4517c83 Merge pull request #564 from justincormack/debug-jq
fix checking for debug key exists
2016-09-26 22:51:41 +01:00
Justin Cormack
ce6ae3a70b fix checking for debug key exists
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-26 22:24:48 +01:00
Justin Cormack
cafa14e1fc Merge pull request #560 from justincormack/chrony-dhcpcd
due to missing config dir in Alpine, force dhcpcd to amend chrony conf
2016-09-26 21:54:39 +01:00
Justin Cormack
9051236f4d Fix dhcp ntp on osx
1. Upstream issue in Alpine that default directory is not used.
2. dhcp appends ntp servers, so delete default first.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-26 21:39:20 +01:00
Justin Cormack
8e62e4cdfd Merge pull request #559 from justincormack/test-tail
Run test in foreground
2016-09-26 12:28:09 +01:00
Justin Cormack
088cbeb78b Merge pull request #556 from justincormack/kernelup
Update Linux kernel to 4.4.22
2016-09-26 12:14:24 +01:00
Justin Cormack
2f99a71e4f Run test in foreground
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-26 12:03:56 +01:00
Justin Cormack
35125bba13 Merge pull request #557 from justincormack/alpineup
Update alpine-base
2016-09-26 00:55:00 +01:00
Justin Cormack
24042ad443 Update alpine-base
Seems insignificant, should probably improve hash function, as
ordering only visibly changed.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-26 00:27:24 +01:00
Justin Cormack
a80281b5e9 Update Linux kernel to 4.4.22
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-26 00:01:53 +01:00