github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-23 19:05:37 +00:00
Code Issues Projects Releases Wiki Activity
2,048 Commits 1 Branch 27 Tags 240 MiB
3f99b0b23f
Commit Graph

2048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Cormack
77a8378e62 Merge pull request #796 from justincormack/toybox-fix 
Fix build failure in toybox build with one argument
 2016-11-28 04:07:08 -08:00
Justin Cormack
33888458e5 Fix build failure in toybox build with one argument 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-28 11:59:09 +00:00
Justin Cormack
60beadb13f Merge pull request #795 from djs55/fix-resize 
Fix filesystem resize by calling `e2fsck -f` first
 2016-11-28 03:42:15 -08:00
David Scott
79f8a87569 Fix filesystem resize by calling e2fsck -f first 
Previously when the block device was resized the partition table was also
resized but the filesystem was not. For an increase from 64GiB to 128GiB
the console showed:

     * Configuring host block device .../dev/vda1: clean, 62/4194304 files, 604445/16776960 blocks
    Resizing disk partition: Unpartitioned space /dev/vda: 64 GiB, 68719476736 bytes, 134217728 sectors
    resize2fs 1.43.3 (04-Sep-2016)
    Please run 'e2fsck -f /dev/vda1' first.

    /dev/vda1: clean, 62/4194304 files, 604445/16776960 blocks

This patch makes `resize2fs` happy by running `e2fsck -f` beforehand as
requested.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-11-28 11:32:12 +00:00
Justin Cormack
b2cae0e086 Merge pull request #794 from justincormack/strace 
Re-add strace
 2016-11-25 09:30:46 -08:00
Justin Cormack
be56c8e68a Re-add strace 
Trying to debug apk issues.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-25 17:26:34 +00:00
Justin Cormack
94f73c7664 Merge pull request #793 from justincormack/tmp-tmpfs 
Add a tmpfs at /tmp
 2016-11-25 09:11:21 -08:00
Justin Cormack
46adfec8a7 Add a tmpfs at /tmp 
This makes sure that once we have ro rootfs any programs that still
for any reason use `/tmp` can still write to it, or if people expect
sharing it into a container to work.

fix #778

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-25 17:05:45 +00:00
Justin Cormack
74db55253f Merge pull request #791 from justincormack/alpinefix 
Make sure we do apk upgrade -a
 2016-11-24 13:13:55 -08:00
Justin Cormack
35c0bfe529 Make sure we do apk upgrade -a 
Also base off 3.4 for consistency.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-24 21:07:00 +00:00
Justin Cormack
87ff76fd97 Merge pull request #789 from justincormack/no-experimental-2 
Remove more references to EXPERIMENTAL
 2016-11-24 07:11:31 -08:00
Justin Cormack
08de1b1477 Remove more references to EXPERIMENTAL 
can use MEDIA_PREFIX to set similar rpefix

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-24 15:02:41 +00:00
Justin Cormack
0daeb4cfc9 Use a 1G AMI 
Now we do dynamic resize, choose the smallest AMI size, 1G rather
than the old 20G AMI.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-24 13:51:53 +00:00
Justin Cormack
9f8c557ce7 Merge pull request #787 from justincormack/no-experimental 
Remove last references to EXPERIMENTAL
 2016-11-24 05:44:27 -08:00
Justin Cormack
997550c1a2 Remove last references to EXPERIMENTAL 
Only support 1.13 now, experimental is a runtime flag.

see #647

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-24 13:37:07 +00:00
Justin Cormack
55b2652bfa Merge pull request #786 from justincormack/git-commit 
Add Moby git commit to image
 2016-11-24 05:14:46 -08:00
Justin Cormack
0e5676d3ab Merge pull request #785 from justincormack/diag-version 
Use daemon version in diagnostics
 2016-11-24 05:11:13 -08:00
Justin Cormack
99a8a959b7 Add Moby git commit to image 
Fix #345

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-24 13:09:58 +00:00
Justin Cormack
28baa22239 Use daemon version in diagnostics 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-24 12:23:27 +00:00
Justin Cormack
fcd04d2e06 Merge pull request #784 from justincormack/baseup 
Update Alpine 3.5 base image
 2016-11-24 04:17:43 -08:00
Justin Cormack
a984ddba27 Update Alpine 3.5 base image 
- openrc updates
- SSL certs package no longer depends on openssl tool in libressl package.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-24 12:08:13 +00:00
Justin Cormack
b01704c937 Merge pull request #783 from justincormack/docker-1.13.0-rc2 
Update to Docker 1.13.0-rc2
 2016-11-23 13:44:47 -08:00
Justin Cormack
32253f83da Update to Docker 1.13.0-rc2 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-23 21:40:23 +00:00
Justin Cormack
8385b4ece3 Merge pull request #779 from justincormack/noexec-run 
Make /run nosuid,noexec
 2016-11-23 06:42:55 -08:00
Justin Cormack
302941638d Merge pull request #780 from justincormack/iptables-proxy 
Explicitly use slirp-proxy in iptables
 2016-11-23 06:42:46 -08:00
Justin Cormack
545b12ee7d Explicitly use slirp-proxy in iptables 
So as to allow a read only root filesystem, we use the proxy
path config option to override the Docker proxy for 1.13.

This means that the iptables override needs to call this binary
not the original docker-proxy binary to allow port forwarding.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-23 13:48:27 +00:00
Justin Cormack
80c9cee485 Make /run nosuid,noexec 
This was not sufficiently locked down.

Fix #720

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-23 12:08:53 +00:00
Justin Cormack
f2b8beb0ee Merge pull request #777 from justincormack/win-trim 
Run TRIM on Windows every 15m
 2016-11-23 03:37:33 -08:00
Justin Cormack
68e3178646 Merge pull request #776 from justincormack/small-swap 
Do not create swap file if the disk is small
 2016-11-23 03:32:33 -08:00
Justin Cormack
41f4841399 Run TRIM on Windows every 15m 
As the Windows virtual device supports TRIM we can run this to free
up disk space frequently. Not recommended to run on physical devices
this often.

See https://github.com/docker/pinata/issues/5298

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-23 11:30:35 +00:00
Justin Cormack
a95ada36a2 Do not create swap file if the disk is small 
- on very small disks, eg CI, do not create a swap file.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-23 11:25:19 +00:00
Justin Cormack
e35e337503 Merge pull request #775 from justincormack/extend 
Resize device if there is free space
 2016-11-22 14:41:55 -08:00
Justin Cormack
cd5b2a8f98 Resize device if there is free space 
If the block device has unused free space, extend the filesystem on it.

Fix #120

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-22 21:59:53 +00:00
Justin Cormack
841bbf2d17 Merge pull request #774 from nathanleclaire/azure_init_beta12 
Azure init beta12
 2016-11-21 23:54:17 +00:00
Nathan LeClaire
b51d28e734 Include version and daemon.json in Azure init script 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-11-21 15:43:19 -08:00
Justin Cormack
5c8e8f8eec Merge pull request #773 from justincormack/typo 
fix typo making swap file
 2016-11-21 23:06:14 +00:00
Justin Cormack
3f2eb7630e fix typo making swap file 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-21 23:02:44 +00:00
Justin Cormack
8e23494bed Merge pull request #770 from rneugeba/kernel-fix 
kernel: update/fix patches for 4.8.10
 2016-11-21 22:06:27 +00:00
Justin Cormack
e4688ad245 Merge pull request #769 from justincormack/nossh 
Remove ssh server packages
 2016-11-21 21:56:37 +00:00
Justin Cormack
20f6db11b3 Remove ssh server packages 
These will be containerised, and were disabled anyway.

Need client, as git needs it, and docker needs git.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-21 21:47:10 +00:00
Rolf Neugebauer
253561d2f2 kernel: update/fix patches for 4.8.10 
In particular 8e0e003b50
seem to have remove the net/Kconfig changes

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-11-21 21:37:05 +00:00
Justin Cormack
ff0739afea Merge pull request #768 from justincormack/no-1.12 
Update Docker init script for 1.13
 2016-11-21 21:32:06 +00:00
Justin Cormack
59353f78c0 Update Docker init script for 1.13 
- never update root filesystem see #583
- remove tests for earlier docker versions
- only use iptables override on desktop

fix #753

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-21 21:15:24 +00:00
Justin Cormack
ad06882e19 Merge pull request #766 from justincormack/alpine-3.5-rc2 
Update base image to Alpine 3.5-rc2
 2016-11-21 20:37:01 +00:00
Justin Cormack
835a16d601 Update base image to Alpine 3.5-rc2 
- switch to libressl
- hvtools in main

Note the build images are not switched over yet

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-21 20:30:33 +00:00
Justin Cormack
d8f426480e Merge pull request #765 from justincormack/no-debug 
Remove Alpine packages just used for debugging and build
 2016-11-21 20:21:49 +00:00
Justin Cormack
d2992691a1 Remove Alpine packages just used for debugging and build 
- make, GNU tar only used for self hosting
- strace, ipvsadmin, openssl just for debug

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-21 20:15:37 +00:00
Justin Cormack
8c19491820 Merge pull request #764 from justincormack/extend 
Simplify file system format code
 2016-11-21 19:53:43 +00:00
Justin Cormack
7730fa15ca Simplify file system format code 
- use our own code rather than Alpine setup-disk
- remove alpine setup code as not needed
- do not create swap partitions
- create swap file on desktop editions for now (may remove)

Fix #619

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-21 18:35:13 +00:00
Justin Cormack
380e760779 Merge pull request #702 from justincormack/syslog 
Syslog support for docker logs
 2016-11-21 17:47:31 +00:00