Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to Docker 17.06-ce #1542

Merged
merged 9 commits into from
Oct 19, 2017
Merged

Upgrade to Docker 17.06-ce #1542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0019625
Upgrade to Docker 17.05-ce
bryanlarsen May 31, 2017
efc0c7d
ugly insecure hack to work around https://github.com/kubernetes/kuber…
bryanlarsen May 31, 2017
2969bcd
install docker-proxy
bryanlarsen May 31, 2017
aa2e8fc
Merge remote-tracking branch 'upstream/master' into docker-17.05
bryanlarsen Jun 2, 2017
3cb5332
upgrade to docker-17.06
bryanlarsen Jul 31, 2017
5d9206b
Merge remote-tracking branch 'upstream/master' into docker-17.05
bryanlarsen Jul 31, 2017
1a8c845
doesn't like trailing slash
bryanlarsen Jul 31, 2017
4022957
docker daemon must be started as 'dockerd' in newer versions of docker
bryanlarsen Aug 1, 2017
c7f0344
Merge branch 'master' into docker-17.05
r2d4 Oct 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions deploy/iso/minikube-iso/package/docker-bin/docker-bin.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
sha256 893e3c6e89c0cd2c5f1e51ea41bc2dd97f5e791fcfa3cee28445df277836339d docker-1.11.1.tgz
sha256 cadc6025c841e034506703a06cf54204e51d0cadfae4bae62628ac648d82efdd docker-1.12.6.tgz
sha256 e582486c9db0f4229deba9f8517145f8af6c5fae7a1243e6b07876bd3e706620 docker-17.06.0-ce.tgz
8 changes: 6 additions & 2 deletions deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
################################################################################

DOCKER_BIN_VERSION = 1.12.6
DOCKER_BIN_SITE = https://get.docker.com/builds/Linux/x86_64
DOCKER_BIN_VERSION = 17.06.0-ce
DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64
DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz

define DOCKER_BIN_USERS
Expand Down Expand Up @@ -46,6 +46,10 @@ define DOCKER_BIN_INSTALL_INIT_SYSTEMD
$(INSTALL) -D -m 644 \
$(BR2_EXTERNAL)/package/docker-bin/docker.socket \
$(TARGET_DIR)/usr/lib/systemd/system/docker.socket

$(INSTALL) -D -m 644 \
$(BR2_EXTERNAL_MINIKUBE_PATH)/package/docker-bin/forward.conf \
$(TARGET_DIR)/etc/sysctl.d/forward.conf
endef

$(eval $(generic-package))
2 changes: 2 additions & 0 deletions deploy/iso/minikube-iso/package/docker-bin/forward.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
net.ipv4.ip_forward=1

2 changes: 1 addition & 1 deletion pkg/provision/buildroot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Environment=DOCKER_RAMDISK=yes
# will catch this invalid input and refuse to start the service with an error like:
# Service has more than one ExecStart= setting, which is only allowed for Type=oneshot services.
ExecStart=
ExecStart=/usr/bin/docker daemon -H tcp://0.0.0.0:{{.DockerPort}} -H unix:///var/run/docker.sock --tlsverify --tlscacert {{.AuthOptions.CaCertRemotePath}} --tlscert {{.AuthOptions.ServerCertRemotePath}} --tlskey {{.AuthOptions.ServerKeyRemotePath}} {{ range .EngineOptions.Labels }}--label {{.}} {{ end }}{{ range .EngineOptions.InsecureRegistry }}--insecure-registry {{.}} {{ end }}{{ range .EngineOptions.RegistryMirror }}--registry-mirror {{.}} {{ end }}{{ range .EngineOptions.ArbitraryFlags }}--{{.}} {{ end }}
ExecStart=/usr/bin/dockerd -H tcp://0.0.0.0:{{.DockerPort}} -H unix:///var/run/docker.sock --tlsverify --tlscacert {{.AuthOptions.CaCertRemotePath}} --tlscert {{.AuthOptions.ServerCertRemotePath}} --tlskey {{.AuthOptions.ServerKeyRemotePath}} {{ range .EngineOptions.Labels }}--label {{.}} {{ end }}{{ range .EngineOptions.InsecureRegistry }}--insecure-registry {{.}} {{ end }}{{ range .EngineOptions.RegistryMirror }}--registry-mirror {{.}} {{ end }}{{ range .EngineOptions.ArbitraryFlags }}--{{.}} {{ end }}
ExecReload=/bin/kill -s HUP $MAINPID

# Having non-zero Limit*s causes performance problems due to accounting overhead
Expand Down