Make IMAGE_TAG configurable for dockerd.json

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: aabd5d3b852b3b3f7131cdd622a9e5078f193819
Component: packaging
This commit is contained in:
Eli Uriegas
2018-08-18 21:27:35 +00:00
parent 0500a90795
commit d0741cffba
3 changed files with 5 additions and 3 deletions
+1 -1
View File
@@ -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",
+3 -1
View File
@@ -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
+1 -1
View File
@@ -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