github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-12-05 12:43:46 +00:00
Code Issues Projects Releases Wiki Activity
1,364 Commits 1 Branch 31 Tags
588798404f2b901b6ae69c742f567bd75f8f41ef
Commit Graph

149 Commits

Author SHA1 Message Date
Justin Cormack
64fd8d7a5c Update docker to 1.12.2-rc3 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-10-08 13:00:15 +02:00
Justin Cormack
09ad0a2aa2 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
3bb527c6bb 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
Justin Cormack
ff744d8acc 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
c001ded03b 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
f19a699715 Add support for running a development bundle of Docker 
Add a database key `bundle` that contains a path to a Docker dev
bundle eg `/.../docker/bundles/1.13.0-dev` where the docker
binaries to run can be found. This will be paired with a script
in `docker/docker` to set this key, so users can easily help
contribute to Docker development.

The change will be permanent until the key is removed or a factory
reset is done, or the bundle cannot be found.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-13 22:46:27 +01:00
Justin Cormack
a1f78bf3c9 rm docker container used for binary extraction 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-12 16:37:24 +01:00
Justin Cormack
bba6934f22 for release docker binaries we can fetch from docker hub rather than curl, so will be cached 
Allow override in case docker images not released

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-12 16:36:01 +01:00
Justin Cormack
c51a0b831e Simplify kernel output and main Dockerfile 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-09-12 16:02:07 +01:00
Justin Cormack
b1597ff9a9 Move all output to the directories it will be in eventually 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-09-12 16:02:07 +01:00
Justin Cormack
02a76828be clean up docker Makefile 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-09-12 16:00:53 +01:00
Ken Cochrane
e3082bcf2a Add ability to pass url to docker binaries 
Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
 2016-09-12 10:55:09 -04:00
Justin Cormack
97ef6ccf2a remove old arm docker binary, now releases are available upstream 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-02 16:50:35 +01:00
Justin Cormack
0dcd6641e1 Run dockerd in debug mode if not overridden in config file 
Fix #448

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-31 12:29:23 +01:00
Justin Cormack
bfcfb7c3a4 Always copy in docker-proxy 
Fix #434

Stupid mistake, sorry!

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-08-26 09:18:15 +01:00
Justin Cormack
cf6ce0c0a9 Remove hacky code for fast shutdown 
Shutdown without this still seems pretty quick, and we are no longer
shutting down frequently for state changes, so I think this is a
reasonable change.

See #430

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-08-24 00:24:02 +01:00
Justin Cormack
1e80ba4fe2 Resolved how to get busybox to created shared mounts 
Not documented...

Removed util-linux again.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-23 00:17:08 +01:00
Justin Cormack
3f381afbfb Fix shared mount of /run 
Needs util-linux for now, see https://github.com/docker/moby/issues/424

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-22 23:04:57 +01:00
Justin Cormack
1dd45af6ce List all docker binaries explicitly 
This will make it fail correctly on old versions that are unsupported.

Allow override of download host.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-19 14:50:18 +01:00
Nathan LeClaire
794af5ea3e Bump for Docker 1.12.1 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-08-18 10:49:07 -07:00
Justin Cormack
2245476095 Update docker to 1.12.1-rc2 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-17 11:28:21 +01:00
Justin Cormack
832b290a2b Update to Docker 1.12.1-rc1 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-12 21:42:48 +01:00
Justin Cormack
b6c9bd9b88 Create a systemd cgroups mountpoint 
This allows systemd based containers to "just work".

Fixes https://github.com/docker/pinata/issues/3126

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-10 14:27:17 +01:00
Justin Cormack
05610e7965 Allow longer for Docker to shut down 
Docker needs 10s at least for containers to be allowed to shut down,
so allow 15s maximum between SIGTERM and SIGKILL.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-28 17:25:49 +01:00
Justin Cormack
202cb42a84 Update docker to 1.12.0 final 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-28 00:43:12 +01:00
Justin Cormack
6973159dce On desktop editions, set default swarm advertise address to eth0 
This allows plain `swarm init` to work. We do not support multi
node clusters yet as there is no way to reqach this address from
externally at present.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-26 16:10:20 +01:00
Justin Cormack
54f6dcc44e Update Docker to 1.12.0-rc5 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-26 13:23:29 +01:00
Justin Cormack
b17a1b7366 Support make flags for Docker version and experimental 
Use `make DOCKER_VERSION=xxx` to override version. Note that
as install process and packaging may vary this may not work.

Use `make DOCKER_EXPERIMENTAL=0` to build from either release
binaries, if version is a final release or test binaries for
release candidates.

Building experimental is still the default.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-26 13:18:09 +01:00
Justin Cormack
3c8c48f459 Posixly correct = not == 
See #161 #170 should be covered...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-20 12:33:01 +01:00
Justin Cormack
3d3b67d0c3 Add conditional services based on mobyplatform 
Replaces https://github.com/docker/moby/pull/282

Use mobyplatform=xxx to specify platform in boot command

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-18 12:39:14 +01:00
Justin Cormack
5b7ff1f6ef Wait for docker to finish starting up before terminateing init script 
This means dependent services can rely on docker being up.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 11:29:32 +01:00
Justin Cormack
9dad6b6467 set nofile ulimit to maximum possible value 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-13 14:04:49 +01:00
Justin Cormack
72861a6c88 update to 1.12.0-rc4 upstream version 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-13 09:50:25 +01:00
Rolf Neugebauer
f8c53db413 init: don't start docker on 0.0.0.0:2375 on DfM/DfW 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-07-12 14:08:55 +01:00
David Scott
dba37b747c /etc/init.d/docker: prepend /usr/local/sbin to the $PATH 
This is where the iptables wrapper lives.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-07-12 10:26:42 +01:00
David Sheets
11f965ce7b Remove /Mac in docker init and transfused init 
Replace /Mac with /host_docker_app and replace driverDir with just driver.

Signed-off-by: David Sheets <dsheets@docker.com>
 2016-07-08 14:36:26 -07:00
Justin Cormack
18b933e81b use cat not sysctl for reading sysctl values 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-04 15:47:46 +01:00
Justin Cormack
265ed43f21 Increase ulimits as high as possible 
Setting unlimited improves performance.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-04 14:37:28 +01:00
Justin Cormack
994f2c965a Merge pull request #243 from djs55/docker.1.12-rc3 
Update docker to 1.12.0-rc3
 2016-07-04 11:10:38 +01:00
David Scott
269d61a849 Update docker to 1.12.0-rc3 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-07-04 11:04:29 +01:00
David Sheets
9d3e8ad516 docker init: remove fixed host export mounts 
Signed-off-by: David Sheets <dsheets@docker.com>
(cherry picked from commit 760840ac69)
 2016-07-02 12:27:09 -07:00
Justin Cormack
2d67ea5cb8 Merge pull request #218 from ijc25/mkdir-p 
Use "mkdir -p /run/log" in docker initfile
 2016-06-17 14:03:14 +01:00
Ian Campbell
013599c78f Use "mkdir -p /run/log" in docker initfile 
For the "no error if existing" rather than "make parents" affect. Otherwise:

moby:~# service docker restart
 * Stopping docker
 * Starting Docker ...
mkdir: can't create directory '/run/log': File exists
 [ ok ]

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-06-17 13:57:33 +01:00
Ian Campbell
9cc8e4a106 Avoid brace expansion which is a bashism. 
Building on Debian where /bin/sh is dash:

make[1]: Leaving directory '/home/ijc/development/Docker/moby.git/alpine/packages/docker/docker.git'
mkdir -p bin
cp docker.git/bundles/latest/binary-daemon/{dockerd,docker-runc} bin/
cp: cannot stat 'docker.git/bundles/latest/binary-daemon/{dockerd,docker-runc}': No such file or directory
Makefile:9: recipe for target 'bin' failed

Pasting the construct into a file and running checkbashsisms:
possible bashism in foo line 2 (brace expansion):
cp docker.git/bundles/latest/binary-daemon/{dockerd,docker-runc} bin/

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-06-17 13:54:14 +01:00
Justin Cormack
d5f0876276 Update to 1.12.0-rc2 
Currently the repo points to just the cherrypicks, not yet final tag

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-17 13:24:44 +01:00
Justin Cormack
baaa38bc4c default to Docker experimental; later we will need to do multiple builds 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-15 10:28:26 +01:00
Justin Cormack
4544bbac58 update docker to 1.12.0-rc1 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-15 10:19:31 +01:00
Justin Cormack
759ad55f03 Update to docker 1.12-dev plus proxy patches, close to what will be rc1 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-14 14:13:36 +01:00
Ian Campbell
c5940b3479 Bind the original /var/log onto /run/log 
So that it can be inspected while debugging.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-06-13 12:07:26 +01:00
Ian Campbell
a2ba682878 Use /proc/mounts in docker init script 
Switch one instance of /etc/mtab.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-06-13 12:07:26 +01:00