Merge pull request #147 from seemethere/c

Make ENGINE_IMAGE configurable for dockerd.json
Upstream-commit: 411a802
Component: packaging

components/packaging/common/dockerd.json

@@ -1,5 +1,5 @@
 {
-    "image": "docker.io/docker/engine-community:${IMAGE_TAG}",
+    "image": "docker.io/${ENGINE_IMAGE}:${IMAGE_TAG}",
     "namespace":"docker",
     "args": [
         "-s", "overlay",

components/packaging/deb/Makefile

@@ -28,6 +28,7 @@ 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))
+ENGINE_IMAGE=docker/engine-community
 
 IMAGE_TAG=nightly
 
@@ -147,6 +148,6 @@ sources/docker.service: ../systemd/docker.service
 
 sources/dockerd.json: ../common/dockerd.json
 	mkdir -p $(@D)
-	sed 's/$${IMAGE_TAG}/$(IMAGE_TAG)/' $< > $@
+	sed -e 's!$${ENGINE_IMAGE}!$(ENGINE_IMAGE)!' -e 's/$${IMAGE_TAG}/$(IMAGE_TAG)/' $< > $@
 
 # TODO: Figure out a sufficient offline solution

components/packaging/rpm/Makefile

@@ -30,6 +30,7 @@ RPMBUILD_FLAGS?=-ba\
 	--define '_origversion $(word 4, $(GEN_RPM_VER))' \
 	$(SPECS)
 RUN?=$(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS)
+ENGINE_IMAGE=docker/engine-community
 
 SOURCE_FILES=containerd-proxy.tgz cli.tgz containerd-shim-process.tar docker.service dockerd.json
 SOURCES=$(addprefix rpmbuild/SOURCES/, $(SOURCE_FILES))
@@ -111,6 +112,6 @@ rpmbuild/SOURCES/docker.service: ../systemd/docker.service
 
 rpmbuild/SOURCES/dockerd.json: ../common/dockerd.json
 	mkdir -p $(@D)
-	sed 's/$${IMAGE_TAG}/$(IMAGE_TAG)/' $< > $@
+	sed -e 's!$${ENGINE_IMAGE}!$(ENGINE_IMAGE)!' -e 's/$${IMAGE_TAG}/$(IMAGE_TAG)/' $< > $@
 
 # TODO: Figure out a sufficient offline solution