Merge pull request #146 from seemethere/configurable

Make IMAGE_TAG configurable for dockerd.json
Upstream-commit: e344a52260c8774a3de2a648d8b055e83d27b6f7
Component: packaging

components/packaging/Jenkinsfile

@@ -53,7 +53,7 @@ test_steps = [
 
 arches = [
 	"x86_64",
-	"s390x",
+	// "s390x",
 	"ppc64le",
 	"aarch64",
 	"armhf"

components/packaging/common/dockerd.json

@@ -1,5 +1,5 @@
 {
-    "image": "docker.io/seemethere/engine-community:0.0.0-20180814124044-678d4b3a6d.x86_64",
+    "image": "docker.io/docker/engine-community:${IMAGE_TAG}",
     "namespace":"docker",
     "args": [
         "-s", "overlay",

components/packaging/deb/Makefile

@@ -29,6 +29,8 @@ RUN=docker run --rm -i \
 SOURCE_FILES=containerd-proxy.tgz cli.tgz containerd-shim-process.tar docker.service dockerd.json
 SOURCES=$(addprefix sources/, $(SOURCE_FILES))
 
+IMAGE_TAG=nightly
+
 .PHONY: help
 help: ## show make targets
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf " \033[36m%-20s\033[0m  %s\n", $$1, $$2}' $(MAKEFILE_LIST)
@@ -145,6 +147,6 @@ sources/docker.service: ../systemd/docker.service
 
 sources/dockerd.json: ../common/dockerd.json
 	mkdir -p $(@D)
-	cp $< $@
+	sed 's/$${IMAGE_TAG}/$(IMAGE_TAG)/' $< > $@
 
 # TODO: Figure out a sufficient offline solution

components/packaging/rpm/Makefile

@@ -111,6 +111,6 @@ rpmbuild/SOURCES/docker.service: ../systemd/docker.service
 
 rpmbuild/SOURCES/dockerd.json: ../common/dockerd.json
 	mkdir -p $(@D)
-	cp $< $@
+	sed 's/$${IMAGE_TAG}/$(IMAGE_TAG)/' $< > $@
 
 # TODO: Figure out a sufficient offline solution