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
Justin Cormack
ff57ad7789
Merge pull request #531 from rneugeba/hvtools-out
...
remove special hack hvtools
2016-09-24 14:29:55 +01:00
Justin Cormack
6b002dcd5f
Merge pull request #554 from justincormack/trim
...
Add weekly cron job to TRIM drive
2016-09-24 14:26:41 +01:00
Justin Cormack
635d99d243
Add weekly cron job to TRIM drive
...
See #536
This is the recommended frequency. For desktop this might be less
suitable, so we may want to adjust
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-24 14:18:49 +01:00
Justin Cormack
82a4e55324
Merge pull request #553 from justincormack/docker-init
...
Copy docker-init if present
2016-09-23 18:14:37 +01:00
Justin Cormack
69beeca467
Copy docker-init if present
...
Fix #552
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-23 18:11:05 +01:00
Justin Cormack
e0be762eb1
Merge pull request #549 from justincormack/dhcpcd-2
...
Switch to dhcpcd
2016-09-23 15:59:46 +01:00
Justin Cormack
07103e7e62
Switch to dhcpcd
...
Should fix issue with not sending hostname which Azure needs.
This should be requesting all the dhcp features we currently use.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-23 15:52:30 +01:00
Justin Cormack
b7151cce35
Merge pull request #550 from justincormack/no-dhcpcd
...
remove dhcpcd as was running anyway
2016-09-23 13:39:29 +01:00
Justin Cormack
af2bc73551
remove dhcpcd as was running anyway
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-23 13:34:17 +01:00
Rolf Neugebauer
fa0104c04c
base: update manifest
...
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-09-23 11:11:07 +01:00
Rolf Neugebauer
8666f6c9f4
packages: add hvtools from edge/testing
...
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-09-23 11:03:40 +01:00
Rolf Neugebauer
c9594c5a02
packages: remove hvtools
...
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-09-23 11:03:40 +01:00
Justin Cormack
041da8cf1b
Merge pull request #546 from rneugeba/if-clean
...
Clean up network interface
2016-09-23 10:41:15 +01:00
Justin Cormack
876e6ef780
Merge pull request #547 from docker/build-vhd
...
initial how-to build vhd
2016-09-23 10:37:06 +01:00
French Ben
8a8fa5a7b4
initial how-to build vhd
2016-09-22 16:24:58 -07:00
Rolf Neugebauer
803be36b96
net: consolidate DHCP onto eth0 only
...
- rename DfW main interface eth0
- remove eth1 DHCP config
- create tap device in init script not interfaces file
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-09-22 18:12:45 +01:00
Justin Cormack
519438f982
Merge pull request #545 from justincormack/update-alpine-add-more
...
Update base image
2016-09-22 18:09:14 +01:00
Justin Cormack
b5f31eda60
Merge pull request #544 from justincormack/noswap
...
Do not fail if disk is partitioned but has no swap
2016-09-22 17:25:26 +01:00
Justin Cormack
a62f4ce7dd
Update base image
...
- fix `df` failing with overlay
- four more openssl CVEs
- add dhcpcd (unused)
- add openssh server (unused)
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-22 16:42:06 +01:00
Justin Cormack
cac5f969a1
Do not fail if disk is partitioned but has no swap
...
Fix #543
Also clean up quoting and unused parts a little.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-22 16:30:28 +01:00
Rolf Neugebauer
b5e38ce811
net: rename Hyper-V internal network to hvint0 and configure it
...
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-09-22 16:17:26 +01:00
Justin Cormack
7c84387b80
Merge pull request #540 from justincormack/local
...
Enable local service
2016-09-22 16:05:39 +01:00
Justin Cormack
5a59a406d6
Merge pull request #541 from justincormack/sorted-packages
...
Sort list of packages
2016-09-22 16:05:22 +01:00
Justin Cormack
602c9266f9
Sort list of packages
...
fix #537
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-22 13:42:09 +01:00
Justin Cormack
b46eb7f3d9
Enable local service
...
Files in `/etc/local.d/` will be executed:
If a file in this directory is executable and it has a .start extension,
it will be run when the local service is started. If a file is
executable and it has a .stop extension, it will be run when the local
service is stopped.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-22 13:39:10 +01:00
Justin Cormack
a72a9775df
Merge pull request #538 from justincormack/iso-rework
...
Standalone make iso image, rather than build+run
2016-09-22 13:26:24 +01:00
Justin Cormack
2d483a20b0
Standalone make iso image, rather than build+run
...
Simpler to have an image that takes the kernel and initrd as input,
rather than building them into the image.
The rest need converting.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-22 13:12:23 +01:00
Justin Cormack
340f37d93c
Merge pull request #534 from kencochrane/fix_makefile_ami_build
...
Added missing ENV variables to AMI build
2016-09-21 09:57:11 +01:00