From 1ba2a2621f3a473898ad17117bb73fee7837e777 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Tue, 11 Sep 2018 15:34:37 +0000 Subject: [PATCH 1/3] Bump proxy to 35c543b Includes fixes related to upgrade cycles Signed-off-by: Eli Uriegas (cherry picked from commit 83a20d53f14adcd2bcc9e932435aa66b6e056afa) Signed-off-by: Eli Uriegas Upstream-commit: befa3c61954d12f2413df56a384989d7ae2cb9b3 Component: packaging --- components/packaging/containerd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/packaging/containerd.mk b/components/packaging/containerd.mk index 0e024c8de3..2620772844 100644 --- a/components/packaging/containerd.mk +++ b/components/packaging/containerd.mk @@ -1,6 +1,6 @@ # Common things for containerd functionality -CONTAINERD_PROXY_COMMIT=9a227f7e8a35ed802617a67d77b1e6aa3b767474 +CONTAINERD_PROXY_COMMIT=35c543bd887878714213cf61ee14038499fd25b7 CONTAINERD_SHIM_PROCESS_IMAGE=docker.io/docker/containerd-shim-process:ff98a47 # If containerd is running use that socket instead From 1b98ea205743c3a768b14d75eb6152c4f1ca1639 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Wed, 12 Sep 2018 02:23:51 -0700 Subject: [PATCH 2/3] Remove need for SUFFIX in gen-deb-ver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Should generate correct bits whether or not the suffix is present. Working example: ❯ ./gen-deb-ver . 18.09.0-beta1 18.09.0~1.1.beta1 18.09.0-beta1 ❯ ./gen-deb-ver . 18.09.0-ce-beta1 18.09.0~ce~1.1.beta1 18.09.0-ce-beta1 Signed-off-by: Eli Uriegas (cherry picked from commit 9de3f6fb573806abc2e546447c41552ff90731a4) Signed-off-by: Eli Uriegas Upstream-commit: cc336d0804076b31d6d059b164e9b4e3b3cec886 Component: packaging --- components/packaging/deb/gen-deb-ver | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/components/packaging/deb/gen-deb-ver b/components/packaging/deb/gen-deb-ver index 868880c2a3..167dcc02da 100755 --- a/components/packaging/deb/gen-deb-ver +++ b/components/packaging/deb/gen-deb-ver @@ -4,8 +4,6 @@ ENGINE_DIR="$1" VERSION="$2" origVersion=$VERSION -SUFFIX=${SUFFIX:=ce} - [[ $# < 2 ]] && echo 'not enough args' && exit 1 DATE_COMMAND="date" @@ -15,14 +13,14 @@ fi gen_deb_version() { # Adds an increment to the deb version to get proper order - # 18.01.0-${SUFFIX}-tp1 -> 18.01.0-${SUFFIX}-0.1-tp1 - # 18.01.0-${SUFFIX}-beta1 -> 18.01.0-${SUFFIX}-1.1-beta1 - # 18.01.0-${SUFFIX}-rc1 -> 18.01.0-${SUFFIX}-2.1-rc1 - # 18.01.0-${SUFFIX} -> 18.01.0-${SUFFIX}-3 + # 18.01.0-tp1 -> 18.01.0-0.1-tp1 + # 18.01.0-beta1 -> 18.01.0-1.1-beta1 + # 18.01.0-rc1 -> 18.01.0-2.1-rc1 + # 18.01.0 -> 18.01.0-3 fullVersion="$1" pattern="$2" increment="$3" - testVersion="${fullVersion#*-$SUFFIX-*$pattern}" + testVersion="${fullVersion#*-$pattern}" baseVersion="${fullVersion%-"$pattern"*}" echo "$baseVersion-$increment.$testVersion.$pattern$testVersion" } From 434a8b60cc37a74ae547998066befcf5c3a2a138 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Wed, 12 Sep 2018 06:28:16 -0700 Subject: [PATCH 3/3] Remove the arch in the image tag Signed-off-by: Eli Uriegas (cherry picked from commit f7b0d0742e4b23e3442ce78cbc0d4c190929eb96) Signed-off-by: Eli Uriegas Upstream-commit: 0fb14f8b914ada119d74818637e4a13176a51410 Component: packaging --- components/packaging/image/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/packaging/image/Makefile b/components/packaging/image/Makefile index b0ba519742..c3be6bb344 100644 --- a/components/packaging/image/Makefile +++ b/components/packaging/image/Makefile @@ -35,7 +35,7 @@ $(ENGINE_DIR)/Dockerfile.engine: # builds across multiple archs because the base images # utilize manifests image-linux: $(ENGINE_DIR)/Dockerfile.engine - docker build -t $(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION).$(ARCH) \ + docker build -t $(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION) \ --build-arg GO_IMAGE="$(ENGINE_GO_IMAGE)" \ --build-arg VERSION="$(STATIC_VERSION)" \ --build-arg GITCOMMIT="$$(cd $(ENGINE_DIR) && git rev-parse --short=7 HEAD)" \ @@ -44,7 +44,7 @@ image-linux: $(ENGINE_DIR)/Dockerfile.engine --build-arg PRODUCT="$(PRODUCT)" \ --build-arg DEFAULT_PRODUCT_LICENSE="$(DEFAULT_PRODUCT_LICENSE)" \ --file $< $(ENGINE_DIR) - echo $(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION).$(ARCH) > $@ + echo $(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION) > $@ DOCKER2OCI=artifacts/docker2oci $(DOCKER2OCI): @@ -66,4 +66,4 @@ engine-$(ARCH)-docker-compat.tar: image-linux .PHONY: release release: - docker push $(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION).$(ARCH) + docker push $(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION)