124 lines
4.6 KiB
Diff
124 lines
4.6 KiB
Diff
From 506db3cdb825a3bbc67939ce0bf5e72c959ac42e Mon Sep 17 00:00:00 2001
|
|
From: Pascal Vizeli <pvizeli@syshack.ch>
|
|
Date: Mon, 28 May 2018 12:48:37 +0000
|
|
Subject: [PATCH 1/1] docker-engine: bump to v18.03.1-ce
|
|
|
|
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
|
|
---
|
|
package/docker-engine/docker-engine.hash | 2 +-
|
|
package/docker-engine/docker-engine.mk | 46 +++++++++++++++++-------
|
|
2 files changed, 34 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash
|
|
index 6c0ed338a5..19c6c73122 100644
|
|
--- a/package/docker-engine/docker-engine.hash
|
|
+++ b/package/docker-engine/docker-engine.hash
|
|
@@ -1,2 +1,2 @@
|
|
# Locally calculated
|
|
-sha256 4716df117d867b82ddab2e82395cd40aa3d0925a689eedcec8919729e4c9f121 docker-engine-v17.05.0-ce.tar.gz
|
|
+sha256 b05f3709844c45d49922914cf6eb71d4131d0bd5389361376ff6a86aa186f4a0 docker-engine-v18.03.1-ce.tar.gz
|
|
diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
|
|
index ba84b4cf0a..12c8ad5a61 100644
|
|
--- a/package/docker-engine/docker-engine.mk
|
|
+++ b/package/docker-engine/docker-engine.mk
|
|
@@ -4,9 +4,8 @@
|
|
#
|
|
################################################################################
|
|
|
|
-DOCKER_ENGINE_VERSION = v17.05.0-ce
|
|
-DOCKER_ENGINE_COMMIT = 89658bed64c2a8fe05a978e5b87dbec409d57a0f
|
|
-DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION))
|
|
+DOCKER_ENGINE_VERSION = v18.03.1-ce
|
|
+DOCKER_ENGINE_SITE = $(call github,docker,docker-ce,$(DOCKER_ENGINE_VERSION))
|
|
|
|
DOCKER_ENGINE_LICENSE = Apache-2.0
|
|
DOCKER_ENGINE_LICENSE_FILES = LICENSE
|
|
@@ -15,14 +14,16 @@ DOCKER_ENGINE_DEPENDENCIES = host-go host-pkgconf
|
|
|
|
DOCKER_ENGINE_LDFLAGS = \
|
|
-X main.GitCommit=$(DOCKER_ENGINE_VERSION) \
|
|
- -X main.Version=$(DOCKER_ENGINE_VERSION)
|
|
+ -X main.Version=$(DOCKER_ENGINE_VERSION) \
|
|
+ -X github.com/docker/cli/cli.GitCommit=$(DOCKER_ENGINE_VERSION) \
|
|
+ -X github.com/docker/cli/cli.Version=$(DOCKER_ENGINE_VERSION)
|
|
|
|
ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT),y)
|
|
DOCKER_ENGINE_LDFLAGS += -extldflags '-static'
|
|
endif
|
|
|
|
-DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen
|
|
-DOCKER_ENGINE_BUILD_TARGETS = cmd/docker
|
|
+DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen apparmor
|
|
+DOCKER_ENGINE_BUILD_TARGETS = docker
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
|
|
DOCKER_ENGINE_TAGS += seccomp
|
|
@@ -36,7 +37,7 @@ endif
|
|
|
|
ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y)
|
|
DOCKER_ENGINE_TAGS += daemon
|
|
-DOCKER_ENGINE_BUILD_TARGETS += cmd/dockerd
|
|
+DOCKER_ENGINE_BUILD_TARGETS += dockerd
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL),y)
|
|
@@ -61,25 +62,26 @@ else
|
|
DOCKER_ENGINE_TAGS += exclude_graphdriver_vfs
|
|
endif
|
|
|
|
-DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS))
|
|
-
|
|
define DOCKER_ENGINE_RUN_AUTOGEN
|
|
- cd $(@D) && \
|
|
- GITCOMMIT="$$(echo $(DOCKER_ENGINE_COMMIT) | head -c7)" \
|
|
+ ln -fs $(@D)/components/engine $(@D)/_gopath/src/github.com/docker/docker
|
|
+ ln -fs $(@D)/components/cli $(@D)/_gopath/src/github.com/docker/cli
|
|
+ cd $(@D)/components/engine && \
|
|
BUILDTIME="$$(date)" \
|
|
+ IAMSTATIC="true" \
|
|
VERSION="$(patsubst v%,%,$(DOCKER_ENGINE_VERSION))" \
|
|
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" $(TARGET_MAKE_ENV) \
|
|
bash ./hack/make/.go-autogen
|
|
endef
|
|
|
|
DOCKER_ENGINE_POST_CONFIGURE_HOOKS += DOCKER_ENGINE_RUN_AUTOGEN
|
|
+DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS))
|
|
|
|
ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y)
|
|
|
|
define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD
|
|
- $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.service \
|
|
+ $(INSTALL) -D -m 0644 $(@D)/components/engine/contrib/init/systemd/docker.service \
|
|
$(TARGET_DIR)/usr/lib/systemd/system/docker.service
|
|
- $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.socket \
|
|
+ $(INSTALL) -D -m 0644 $(@D)/components/engine/contrib/init/systemd/docker.socket \
|
|
$(TARGET_DIR)/usr/lib/systemd/system/docker.socket
|
|
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/
|
|
ln -fs ../../../../usr/lib/systemd/system/docker.service \
|
|
@@ -92,4 +94,22 @@ endef
|
|
|
|
endif
|
|
|
|
+define DOCKER_ENGINE_BUILD_CMDS
|
|
+ $(foreach target,$(DOCKER_ENGINE_BUILD_TARGETS), \
|
|
+ cd $(@D)/$(DOCKER_ENGINE_WORKSPACE)/src/github.com/docker/$(if $(filter $(target),dockerd),docker,cli); \
|
|
+ $(GO_TARGET_ENV) \
|
|
+ GOPATH="$(@D)/$(DOCKER_ENGINE_WORKSPACE)" \
|
|
+ $(DOCKER_ENGINE_GO_ENV) \
|
|
+ $(GO_BIN) build -v $(DOCKER_ENGINE_BUILD_OPTS) \
|
|
+ -o $(@D)/bin/$(target) \
|
|
+ ./cmd/$(target)
|
|
+ )
|
|
+endef
|
|
+
|
|
+define DOCKER_ENGINE_INSTALL_SYMLINKS
|
|
+ ln -fs tini $(TARGET_DIR)/usr/bin/docker-init
|
|
+endef
|
|
+
|
|
+DOCKER_ENGINE_POST_INSTALL_TARGET_HOOKS += DOCKER_ENGINE_INSTALL_SYMLINKS
|
|
+
|
|
$(eval $(golang-package))
|
|
--
|
|
2.17.0
|
|
|