diff options
| author | Christian Franke <chris@opensourcerouting.org> | 2018-10-18 12:07:24 +0200 |
|---|---|---|
| committer | Christian Franke <chris@opensourcerouting.org> | 2018-11-29 16:51:27 +0100 |
| commit | f1c0836f6700bff9743f08ecbbd99325c3b1d6ae (patch) | |
| tree | 4c34a7be46d0452c175cad58b386a28ad40c9eea | |
| parent | d9e887de2a24635677672a9d57c9da3ccd1acc65 (diff) | |
Docker: Update buildscript not to delete old images
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
| -rwxr-xr-x | tests/topotests/docker/docker.sh | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/tests/topotests/docker/docker.sh b/tests/topotests/docker/docker.sh index ac40e6c5af..4dcee218c9 100755 --- a/tests/topotests/docker/docker.sh +++ b/tests/topotests/docker/docker.sh @@ -30,20 +30,7 @@ CDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # Script begin # -OLD_IMAGE_SHA=$( \ - docker images | \ - egrep "^topotests" | \ - sed -r "s/( )+/ /g" | \ - cut -d " " -f 3 \ -) - -docker build --force-rm --pull --compress -t topotests . || \ - log_fatal "failed to generate topotest docker image" - -if [ ! -z "$OLD_IMAGE_SHA" ]; then - log_info "Removing old topotest image" - docker rmi $OLD_IMAGE_SHA || \ - log_warning "failed to remove old image" -fi - -exit 0 +exec docker build --pull \ + --compress \ + -t frrrouting/topotests \ + . |