github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-08-01 06:58:56 +00:00
Code Issues Projects Releases Wiki Activity
1,908 Commits 1 Branch 27 Tags 240 MiB
8585ddab9b
Commit Graph

1908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Cormack
7bc5b0ae87 Merge pull request #794 from justincormack/strace 
Re-add strace
 2016-11-25 09:30:46 -08:00
Justin Cormack
c860e6e961 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
38183b2f76 Merge pull request #793 from justincormack/tmp-tmpfs 
Add a tmpfs at /tmp
 2016-11-25 09:11:21 -08:00
Justin Cormack
1f87461538 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
6e3f7d3ae8 Merge pull request #791 from justincormack/alpinefix 
Make sure we do apk upgrade -a
 2016-11-24 13:13:55 -08:00
Justin Cormack
8f375ddd48 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
106be2b6de Merge pull request #789 from justincormack/no-experimental-2 
Remove more references to EXPERIMENTAL
 2016-11-24 07:11:31 -08:00
Justin Cormack
a1c2442270 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
bf1af7efb9 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
5d9a0ea220 Merge pull request #787 from justincormack/no-experimental 
Remove last references to EXPERIMENTAL
 2016-11-24 05:44:27 -08:00
Justin Cormack
8ccb1bfdb3 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
d685d8b029 Merge pull request #786 from justincormack/git-commit 
Add Moby git commit to image
 2016-11-24 05:14:46 -08:00
Justin Cormack
76c8e18c58 Merge pull request #785 from justincormack/diag-version 
Use daemon version in diagnostics
 2016-11-24 05:11:13 -08:00
Justin Cormack
be12f5888f 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
65d627b938 Use daemon version in diagnostics 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-24 12:23:27 +00:00
Justin Cormack
da2e816d55 Merge pull request #784 from justincormack/baseup 
Update Alpine 3.5 base image
 2016-11-24 04:17:43 -08:00
Justin Cormack
c2ea4a2381 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
1ee837105f 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
8d7957951c 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
e65098fff2 Merge pull request #779 from justincormack/noexec-run 
Make /run nosuid,noexec
 2016-11-23 06:42:55 -08:00
Justin Cormack
4bdbcbcc33 Merge pull request #780 from justincormack/iptables-proxy 
Explicitly use slirp-proxy in iptables
 2016-11-23 06:42:46 -08:00
Justin Cormack
bd25c68032 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
de7bc5103d 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
6ee9eeb284 Merge pull request #777 from justincormack/win-trim 
Run TRIM on Windows every 15m
 2016-11-23 03:37:33 -08:00
Justin Cormack
b6551b1648 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
3dc7419954 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
4619368531 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
9f45664f6f Merge pull request #775 from justincormack/extend 
Resize device if there is free space
 2016-11-22 14:41:55 -08:00
Justin Cormack
605c34be64 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
c686b47a99 Merge pull request #774 from nathanleclaire/azure_init_beta12 
Azure init beta12
 2016-11-21 23:54:17 +00:00
Nathan LeClaire
7fb43cb289 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
762852b1d4 Merge pull request #773 from justincormack/typo 
fix typo making swap file
 2016-11-21 23:06:14 +00:00
Justin Cormack
3204fafc54 fix typo making swap file 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-21 23:02:44 +00:00
Justin Cormack
a4212b2cbf 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
a042d4d67d Merge pull request #769 from justincormack/nossh 
Remove ssh server packages
 2016-11-21 21:56:37 +00:00
Justin Cormack
30f14dd622 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
df67417538 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
7f75a78b87 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
d1a1d7846b 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
afd3238d25 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
35fdd3268a 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
f49ff89db8 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
36c25e442d 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
94d6bbfa83 Merge pull request #764 from justincormack/extend 
Simplify file system format code
 2016-11-21 19:53:43 +00:00
Justin Cormack
db3cbe2eb2 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
c19e17284d Merge pull request #702 from justincormack/syslog 
Syslog support for docker logs
 2016-11-21 17:47:31 +00:00
Justin Cormack
994eeadb1c Merge pull request #761 from ijc25/kernel-patch-whitespace 
Fixup kernel patch whitepace
 2016-11-21 15:20:57 +00:00
Justin Cormack
543efa6a0d Merge pull request #763 from justincormack/kernelup 
Upgrade Linux to 4.8.10
 2016-11-21 15:20:30 +00:00
Justin Cormack
a08e06bc44 Upgrade Linux to 4.8.10 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-21 15:03:48 +00:00
Ian Campbell
8e0e003b50 Fixup kernel patch whitepace 
Some of git's whitespace fixup option corrupts the patches by (at least)
stripping trailing spaces (which are present for empty lines in context) and
changing leading <space><tab> into just <tab>. `patch(1)` used by the build
here seems to tolerate this, but `git am` and/or `git apply` do not.

Fix this up by running git am and at each failure point (i.e. every patch)
applying the relevant patch using `patch(1)` (which works because `git am` was
unable to even partially apply the patches) before regenerating the whole lot
with `git format-patch`.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-11-21 11:43:48 +00:00