kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

use debian:jessie for ensure-syscall-test 

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
Brian Goff 2016-02-09 13:13:38 -05:00
parent 49a45d80f2
commit 7c9e9afeb7
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -211,7 +211,6 @@ RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker
# Get useful and necessary Hub images so we can "docker load" locally instead of pulling
COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/
RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
alpine:latest@sha256:14f89d0e62577f42622f994da6b1b47159d95516d24ba050952e517b915a41f8 \
buildpack-deps:jessie@sha256:25785f89240fbcdd8a74bdaf30dd5599a9523882c6dfc567f2e9ef7cf6f79db6 \
busybox:latest@sha256:e4f93f6ed15a0cdd342f5aae387886fba0ab98af0a102da6276eaf24d6e6ade0 \
debian:jessie@sha256:f968f10b4b523737e253a97eac59b0d1420b5c19b69928d35801a6373ffe330e \

1
hack/make/.ensure-frozen-images
View File

@ -4,7 +4,6 @@ set -e
# image list should match what's in the Dockerfile (minus the explicit images IDs)
images=(
buildpack-deps:jessie
alpine:latest
busybox:latest
debian:jessie
hello-world:latest

2
hack/make/.ensure-syscall-test
View File

@ -12,7 +12,7 @@ if [ "$DOCKER_ENGINE_GOOS" = "linux" ]; then
dockerfile="${tmpdir}/Dockerfile"
cat <<-EOF > "$dockerfile"
FROM alpine
FROM debian:jessie
COPY . /usr/bin/
EOF
docker build --force-rm ${DOCKER_BUILD_ARGS} -qt syscall-test "${tmpdir}" > /dev/null