github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2026-01-15 19:46:13 +00:00
Code Issues Projects Releases Wiki Activity
1,578 Commits 1 Branch 31 Tags
c686b47a99d952f04ef21727a21e66999efc2796
Commit Graph

699 Commits

Author SHA1 Message Date
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
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
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
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
88eafcc239 update c build base image 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-18 23:32:47 +00:00
Justin Cormack
a85dbe129d Use syslog local0 for docker logs 
This allows log rotation, redirect via syslog etc.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-18 16:23:41 +00:00
Justin Cormack
f5e2adadff Update check-config for Linux 4.8 
Temporarily using unmerged version until upstream.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-18 11:50:36 +00:00
Justin Cormack
a0bddd4f54 Merge pull request #743 from justincormack/no-bind-log 
Do not try to bind mount logs onto host on osx
 2016-11-18 10:43:50 +00:00
Justin Cormack
b5d7cc306c Default to experimental if not specified in daemon.json 
Most editions were shipping with experimental; now it is a daemon
flag this seems the best behaviour.

Only do this on recent dockerd as we are still supporting 1.12 for
a while longer.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-17 20:46:44 +00:00
Justin Cormack
040d6faeab upgrade Docker to 1.13.0-rc1 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-16 16:48:26 +00:00
Justin Cormack
78d0f03b65 Do not try to bind mount logs onto host on osx 
This is not working well, and was binding over the logs, and losing
logs. We need a uniform approach on all platforms, planned to be
syslog.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-16 16:08:03 +00:00
Justin Cormack
da729cffff Merge pull request #738 from ijc25/master 
diagnostics: Collect networking and swarm node + service info
 2016-11-16 15:57:33 +00:00
Justin Cormack
8d406aa46e always wait for vsudd pidfile 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-16 13:07:32 +00:00
Ian Campbell
33c80ced24 diagnostics: Collect networking and swarm node + service info 
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-11-15 17:21:03 +00:00
Justin Cormack
d661b49ff9 Merge pull request #734 from justincormack/diagnostic-fixes 
Fixes to diagnostics
 2016-11-15 11:53:10 +00:00
Justin Cormack
de5bb1c1b9 Fixes and improvements to diagnostics 
- We now only have nslookup not dig.
- Use curl not wget.
- add /proc/cpuinfo

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-15 11:45:29 +00:00
Ian Campbell
e950150495 diagnostics: Collect "docker version" 
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-11-15 11:35:12 +00:00
Ian Campbell
5191a8ffbc diagnostics: Collect "docker info" 
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-11-15 11:33:25 +00:00
Justin Cormack
a3cb39e21a Rework moving automount earlier in boot sequence 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-15 09:54:07 +00:00
Justin Cormack
99018b9424 vsudd needs bootmisc too for /run symlink 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-15 00:19:21 +00:00
Justin Cormack
a476918263 add additional directories on newly created /var 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-14 23:15:46 +00:00
Justin Cormack
345f6c34d3 Correctly handle return codes of fsck 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-14 22:14:25 +00:00
Justin Cormack
96399432f3 Fix /run symlink issues 
- run bootmisc before sysklogd so symlinks from /var/run to
  /run are created
- recreate symlinks that bootmisc created when we remount /var
  until this gets moved earlier

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-14 22:00:12 +00:00
Justin Cormack
2174a9371b Always start vsudd before syslog 
If we are using vsudd to forward syslog to the host, as on osx,
we need to start it before syslog starts, and make sure it has
created its socket.

Add a pidfile to vsudd to make startup more reliable.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-14 17:08:37 +00:00
Justin Cormack
c85a49b628 Merge pull request #718 from justincormack/diagnose-test 
Make diagnostics program return exit code
 2016-11-14 11:38:42 +00:00
Justin Cormack
b7550df1c5 Make diagnostics program return exit code 
Add running diagnostics to test script.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-14 11:30:09 +00:00
Justin Cormack
00ee4be2b5 remove completion directory from newer docker downloads 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-14 11:00:28 +00:00
Justin Cormack
8dbaef8b9c Revert "Format filesystems earlier, before syslog" 
This reverts commit 4dd5dca106.

Fix #710 where system hangs after klogd startup on AWS. Possibly
also affects Windows too. Still unclear why but lets revert and
continue investif=gating.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-12 15:29:27 +00:00
Justin Cormack
4dd5dca106 Format filesystems earlier, before syslog 
So that we can write to /var early, move filesystem formatting as early as possible.

Adds a dummy fsck service, as we already do fsck in format script.

Replaces #535

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-08 15:20:46 +00:00
Justin Cormack
44bc83b7d9 Improve matching of mounted drive in diagnostics 
Was failing on AWS as drive did not match patter that was too precise.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-04 14:09:12 +00:00
Justin Cormack
de81602c68 Update check-config script 
Now returns error if checks do not pass.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-04 09:40:15 +00:00
Justin Cormack
7752c39b73 Merge pull request #672 from justincormack/configup 
Update check-config script
 2016-11-02 21:11:36 +00:00
Justin Cormack
e337dafea9 Update check-config script 
Now misses the ext3 error messages.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-02 20:05:48 +00:00
Justin Cormack
90d2d1ef45 Split out Windows network config from hostsettings 
On cloud editions eg AWS settings may come from the network, so
we need to move this to after network setup, while the Windows
network config changes need to happen before, so split the init script.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-02 14:49:24 +00:00
Justin Cormack
503eb2dcaf Merge pull request #663 from justincormack/curl-fail 
make curl fail on 404
 2016-11-01 19:55:55 +00:00
Justin Cormack
76e902926a fsck filesystem before mount 
Use fsck -p to fix errors that are fixable.

Note this will recreate the filesystem on fatal errors.

Fix #665

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-01 16:01:08 +00:00
Justin Cormack
c758ca67ce make curl fail on 404 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-01 13:58:02 +00:00
Justin Cormack
8cfc2c753f Add check-config container and test 
Currently the test will never fail, planning to fix this upstream.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-10-28 12:39:31 +01:00
Justin Cormack
30dff6a0f4 Add dependency to Makefile for Docker 
The Docker version is in the Makefile su always re-upload if changed.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-10-27 11:29:31 +01:00
Justin Cormack
a25973608e update Docker to 1.12.3 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-10-27 09:14:20 +01:00
Justin Cormack
f625a63084 Update to docker 1.12.3-rc1 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-10-25 10:06:52 +01:00
Justin Cormack
142d621c06 go fmt 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-10-21 15:35:10 +01:00
Justin Cormack
29196a5872 update C build base images for Musl update 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-10-20 13:23:12 +01:00
Justin Cormack
9059240d47 Update to Go 1.7.3 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-10-20 13:17:16 +01:00
Justin Cormack
867557a6b2 Merge pull request #614 from justincormack/git-go 
Add git to Go build package
 2016-10-17 09:49:52 +01:00
Justin Cormack
2c2f600995 add git to Go build package 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-10-16 13:49:28 +01:00
Justin Cormack
0b41443ae3 remove temporary force curl before hub updated 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-10-14 21:58:30 +01:00