github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-08-03 16:00:36 +00:00
Code Issues Projects Releases Wiki Activity

clean up unpacking docker rc3 bundle

Browse Source 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2016-04-03 09:34:01 +01:00
parent 89c6c66c19
commit fac0264ecf
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
alpine/Dockerfile
View File

@ -30,8 +30,7 @@ COPY packages/transfused/transfused /sbin/
COPY packages/transfused/etc /etc/ COPY packages/transfused/etc /etc/
COPY packages/mdnstool/mdnstool /sbin/ COPY packages/mdnstool/mdnstool /sbin/
COPY packages/mdnstool/etc /etc/ COPY packages/mdnstool/etc /etc/
COPY packages/docker/docker /usr/bin/ COPY packages/docker/bin/* /usr/bin/
COPY packages/docker/docker-* /usr/bin/
COPY packages/docker/etc /etc/ COPY packages/docker/etc /etc/
COPY packages/docker-x/docker-x /usr/bin/ COPY packages/docker-x/docker-x /usr/bin/
COPY packages/diagnostics/diagnostics /usr/bin/ COPY packages/diagnostics/diagnostics /usr/bin/

3
alpine/packages/docker/.gitignore vendored
View File

@ -1,2 +1 @@
docker bin/
docker-*

7
alpine/packages/docker/Makefile
View File

@ -6,8 +6,9 @@ OS?=Linux
DOCKER_HOST=$(shell if echo "$(DOCKER_VERSION)" | grep -q -- '-rc'; then echo "test.docker.com"; else echo "get.docker.com"; fi) DOCKER_HOST=$(shell if echo "$(DOCKER_VERSION)" | grep -q -- '-rc'; then echo "test.docker.com"; else echo "get.docker.com"; fi)
docker: docker:
if [ "${ARCH}" != "arm" ] ; then curl -f -L -o docker.tgz https://${DOCKER_HOST}/builds/${OS}/${ARCH}/docker-${DOCKER_VERSION}.tgz && tar xjf docker.tgz && mv docker docker- && mv docker-/* . && rm -rf docker-/ docker.tgz; else cp docker-arm docker; fi mkdir -p bin
chmod +x docker docker-containerd docker-containerd-ctr docker-containerd-shim docker-runc if [ "${ARCH}" != "arm" ] ; then curl -f -L -o docker.tgz https://${DOCKER_HOST}/builds/${OS}/${ARCH}/docker-${DOCKER_VERSION}.tgz && tar xjf docker.tgz && mv docker/* bin && rm -rf docker/ docker.tgz; else cp docker-arm bin/docker; fi
chmod +x bin/*
clean: clean:
rm -f docker docker-containerd docker-containerd-ctr docker-containerd-shim docker-runc rm -rf bin