diff --git a/.travis.yml b/.travis.yml index 617deba..e340cd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,6 @@ language: minimal services: - docker before_install: - - docker pull yadm/testbed:2019-12-02 + - docker pull yadm/testbed:2020-01-20 script: - - docker run -t --rm -v "$PWD:/yadm:ro" yadm/testbed:2019-12-02 + - docker run -t --rm -v "$PWD:/yadm:ro" yadm/testbed:2020-01-20 diff --git a/Dockerfile b/Dockerfile index a8d689a..469fe54 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,7 @@ RUN \ gnupg \ lsb-release \ make \ + man \ python3-pip \ shellcheck=0.4.6-1 \ vim \ diff --git a/Makefile b/Makefile index 5f7ebeb..58363a0 100644 --- a/Makefile +++ b/Makefile @@ -112,7 +112,7 @@ testhost: require-docker --hostname testhost \ --rm -it \ -v "/tmp/testhost:/bin/yadm:ro" \ - yadm/testbed:2019-12-02 \ + yadm/testbed:2020-01-20 \ bash -l .PHONY: scripthost @@ -129,7 +129,7 @@ scripthost: require-docker --rm -it \ -v "$$PWD/script.gz:/script.gz:rw" \ -v "/tmp/testhost:/bin/yadm:ro" \ - yadm/testbed:2019-12-02 \ + yadm/testbed:2020-01-20 \ bash -c "script /tmp/script -q -c 'bash -l'; gzip < /tmp/script > /script.gz" @echo @echo "Script saved to $$PWD/script.gz" diff --git a/docker-compose.yml b/docker-compose.yml index 85afb09..831a062 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,4 +4,4 @@ services: testbed: volumes: - .:/yadm:ro - image: yadm/testbed:2019-12-02 + image: yadm/testbed:2020-01-20