github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-22 02:21:34 +00:00
Code Issues Projects Releases Wiki Activity

Fix build of Docker container

Browse Source 
- rename it `docker-ce` to make it clearer.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2017-03-13 11:32:37 +00:00
parent 9d8977a367
commit 150bf80954
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/docker/Dockerfile → base/docker-ce/Dockerfile
View File

@ -33,4 +33,6 @@ RUN set -x \
&& rm docker.tgz \ && rm docker.tgz \
&& docker -v && docker -v
COPY . ./
ENTRYPOINT ["/usr/bin/docker-init", "/usr/bin/dockerd"] ENTRYPOINT ["/usr/bin/docker-init", "/usr/bin/dockerd"]

4
base/docker/Makefile → base/docker-ce/Makefile
View File

@ -1,14 +1,14 @@
.PHONY: tag push .PHONY: tag push
BASE=alpine:3.5 BASE=alpine:3.5
IMAGE=docker IMAGE=docker-ce
default: push default: push
hash: Dockerfile hash: Dockerfile
DOCKER_CONTENT_TRUST=1 docker pull $(BASE) DOCKER_CONTENT_TRUST=1 docker pull $(BASE)
tar cf - $^ | docker build --no-cache -t $(IMAGE):build - tar cf - $^ | docker build --no-cache -t $(IMAGE):build -
docker run --entrypoint /bin/sh --rm $(IMAGE):build -c 'cat Dockerfile /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > $@ docker run --entrypoint /bin/sh --rm $(IMAGE):build -c 'cat $^ /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > $@
push: hash push: hash
docker pull mobylinux/$(IMAGE):$(shell cat hash) || \ docker pull mobylinux/$(IMAGE):$(shell cat hash) || \