Ensure we have the latest fnproject/dind (#687)

If we need to reissue fnproject/dind:17.12 (which fnproject/fnserver
is based upon) then let's make sure we're using the latest one
when cutting a release.

To ensure we don't accidentally use stale images lying around in
the docker cache (there probably shouldn't be *any*), call
    make clear-images
before running the build.
This commit is contained in:
jan grant
2018-01-19 18:02:25 +00:00
committed by Reed Allman
parent d2e18b28fc
commit d85e6bd61b
3 changed files with 13 additions and 9 deletions

View File

@@ -29,6 +29,7 @@ jobs:
#docker version
- run: docker version
- run: nproc
- run: make clear-images
- run: make full-test -j $(nproc)
- deploy:
command: |

View File

@@ -16,6 +16,14 @@ install:
checkfmt:
./go-fmt.sh
clear-images:
-docker images -q -f dangling=true | xargs docker rmi -f
for i in fnproject/fn-test-utils fnproject/hello fnproject/error fnproject/sleeper fnproject/error \
fnproject/dind fnproject/fnserver fnproject/fnlb; do \
docker images "$$i" --format '{{ .ID }}\t{{ .Repository }}\t{{ .Tag}}' | while read id repo tag; do \
if [ "$$tag" = "<none>" ]; then docker rmi "$$id"; else docker rmi "$$repo:$$tag"; fi; done; done
fn-test-utils: checkfmt
cd images/fn-test-utils && ./build.sh

View File

@@ -6,16 +6,11 @@ if [ $fsdriver == "overlay" ]; then
fsdriver="overlay2"
fi
mkdir -p /etc/docker
/bin/cat > /etc/docker/daemon.json <<EOF
{
"mtu": $(ip link show dev $(ip route |
awk '$1 == "default" { print $NF }') |
awk '{for (i = 1; i <= NF; i++) if ($i == "mtu") print $(i+1)}')
}
EOF
mtu=$(ip link show dev $(ip route |
awk '$1 == "default" { print $NF }') |
awk '{for (i = 1; i <= NF; i++) if ($i == "mtu") print $(i+1)}')
dockerd-entrypoint.sh --storage-driver=$fsdriver &
dockerd-entrypoint.sh --storage-driver=$fsdriver --mtu=$mtu &
# give docker a few seconds
sleep 3