toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09

Browse Source
This commit is contained in:
GordonTheTurtle
2018-08-24 19:54:36 +00:00
parent ca36ebeff9 bcac5c18d0
commit 357d520355
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/packaging/common/dockerd.json
View File

@ -7,5 +7,5 @@
"--default-runtime", "containerd",
"--add-runtime", "containerd=runc"
],
"scope": "ce"
"scope": "${ENGINE_SCOPE}"
}

9
components/packaging/deb/Makefile
View File

@ -29,6 +29,7 @@ RUN=docker run --rm -i \
SOURCE_FILES=containerd-proxy.tgz cli.tgz containerd-shim-process.tar docker.service dockerd.json engine.tar
SOURCES=$(addprefix sources/, $(SOURCE_FILES))
ENGINE_IMAGE=docker/engine-community
ENGINE_SCOPE=ce
IMAGE_TAG=nightly
@ -149,7 +150,11 @@ sources/docker.service: ../systemd/docker.service
sources/dockerd.json: ../common/dockerd.json
mkdir -p $(@D)
sed -e 's!$${ENGINE_IMAGE}!$(ENGINE_IMAGE)!' -e 's/$${IMAGE_TAG}/$(IMAGE_TAG)/' $< > $@
sed \
-e 's!$${ENGINE_IMAGE}!$(ENGINE_IMAGE)!' \
-e 's!$${ENGINE_SCOPE}!$(ENGINE_SCOPE)!' \
-e 's/$${IMAGE_TAG}/$(IMAGE_TAG)/' \
$< > $@
# TODO: Eventually clean this up when we release an image with a manifest
DOCKER2OCI=artifacts/docker2oci
@ -163,7 +168,7 @@ $(DOCKER2OCI):
# offline bundle
sources/engine.tar: $(DOCKER2OCI)
$(MAKE) -C ../image ENGINE_IMAGE=$(ENGINE_IMAGE) image-linux
$(MAKE) -C ../image ENGINE_IMAGE=$(ENGINE_IMAGE) ENGINE_SCOPE=$(ENGINE_SCOPE) image-linux
mkdir -p artifacts
docker save -o artifacts/docker-engine.tar $$(cat ../image/image-linux)
./$(DOCKER2OCI) -i artifacts/docker-engine.tar artifacts/engine-image

9
components/packaging/rpm/Makefile
View File

@ -31,6 +31,7 @@ RPMBUILD_FLAGS?=-ba\
$(SPECS)
RUN?=$(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS)
ENGINE_IMAGE=docker/engine-community
ENGINE_SCOPE=ce
SOURCE_FILES=containerd-proxy.tgz cli.tgz containerd-shim-process.tar docker.service dockerd.json engine.tar
SOURCES=$(addprefix rpmbuild/SOURCES/, $(SOURCE_FILES))
@ -114,7 +115,11 @@ rpmbuild/SOURCES/docker.service: ../systemd/docker.service
rpmbuild/SOURCES/dockerd.json: ../common/dockerd.json
mkdir -p $(@D)
sed -e 's!$${ENGINE_IMAGE}!$(ENGINE_IMAGE)!' -e 's/$${IMAGE_TAG}/$(IMAGE_TAG)/' $< > $@
sed \
-e 's!$${ENGINE_IMAGE}!$(ENGINE_IMAGE)!' \
-e 's!$${ENGINE_SCOPE}!$(ENGINE_SCOPE)!' \
-e 's/$${IMAGE_TAG}/$(IMAGE_TAG)/' \
$< > $@
# TODO: Eventually clean this up when we release an image with a manifest
DOCKER2OCI=artifacts/docker2oci
@ -128,7 +133,7 @@ $(DOCKER2OCI):
# offline bundle
rpmbuild/SOURCES/engine.tar: $(DOCKER2OCI)
$(MAKE) -C ../image ENGINE_IMAGE=$(ENGINE_IMAGE) image-linux
$(MAKE) -C ../image ENGINE_IMAGE=$(ENGINE_IMAGE) ENGINE_SCOPE=$(ENGINE_SCOPE) image-linux
mkdir -p artifacts
docker save -o artifacts/docker-engine.tar $$(cat ../image/image-linux)
./$(DOCKER2OCI) -i artifacts/docker-engine.tar artifacts/engine-image