mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-25 03:34:58 +00:00
Make the Docker download more robust to pipefail errors
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
parent
9fdf1d57a1
commit
2e67fa91b7
@ -30,14 +30,15 @@ endif
|
||||
|
||||
cleanusr:
|
||||
mkdir -p usr/bin
|
||||
rm -f usr/bin/*
|
||||
rm -f usr/bin/* ok
|
||||
|
||||
download: cleanusr
|
||||
ifdef DOCKER_BIN_URL
|
||||
curl -sSL ${DOCKER_BIN_URL} | tar xzf -
|
||||
(curl -sSL ${DOCKER_BIN_URL} && touch ok) | tar xzf -
|
||||
else
|
||||
curl -sSL https://${DOCKER_HOST}/builds/${OS}/${ARCH}/docker-${DOCKER_VERSION}.tgz | tar xzf -
|
||||
(curl -sSL https://${DOCKER_HOST}/builds/${OS}/${ARCH}/docker-${DOCKER_VERSION}.tgz && touch ok) | tar xzf -
|
||||
endif
|
||||
rm ok
|
||||
mv docker/docker-containerd-ctr \
|
||||
docker/docker \
|
||||
docker/docker-containerd \
|
||||
@ -49,10 +50,11 @@ endif
|
||||
([ -e docker/docker-init ] && mv docker/docker-init usr/bin/) || true
|
||||
|
||||
hub: cleanusr
|
||||
docker run --rm $(DOCKER_IMAGE) tar cf - -C /usr/local/bin . | tar xf - -C usr/bin
|
||||
(docker run --rm $(DOCKER_IMAGE) tar cf - -C /usr/local/bin . && touch ok) | tar xf - -C usr/bin
|
||||
rm ok
|
||||
rm -f usr/bin/docker-entrypoint.sh
|
||||
|
||||
clean:
|
||||
rm -rf usr/ docker/
|
||||
rm -rf usr/ docker/ ok
|
||||
|
||||
.DELETE_ON_ERROR:
|
||||
|
Loading…
Reference in New Issue
Block a user