psi-jack
/
yadm
mirror of
1
0
Fork 0
Code Issues Releases Wiki Activity

Add man to testbed Docker image

This commit is contained in:
Tim Byrne 2020-01-20 08:21:57 -06:00
parent d5b217f850
commit d16f4b134a
No known key found for this signature in database
GPG Key ID: 14DB4FC2465A4B12
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -3,6 +3,6 @@ language: minimal
services: services:
- docker - docker
before_install: before_install:
- docker pull yadm/testbed:2019-12-02 - docker pull yadm/testbed:2020-01-20
script: 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

1
Dockerfile
View File

@ -22,6 +22,7 @@ RUN \
gnupg \ gnupg \
lsb-release \ lsb-release \
make \ make \
man \
python3-pip \ python3-pip \
shellcheck=0.4.6-1 \ shellcheck=0.4.6-1 \
vim \ vim \

4
Makefile
View File

@ -112,7 +112,7 @@ testhost: require-docker
--hostname testhost \ --hostname testhost \
--rm -it \ --rm -it \
-v "/tmp/testhost:/bin/yadm:ro" \ -v "/tmp/testhost:/bin/yadm:ro" \
yadm/testbed:2019-12-02 \ yadm/testbed:2020-01-20 \
bash -l bash -l
.PHONY: scripthost .PHONY: scripthost
@ -129,7 +129,7 @@ scripthost: require-docker
--rm -it \ --rm -it \
-v "$$PWD/script.gz:/script.gz:rw" \ -v "$$PWD/script.gz:/script.gz:rw" \
-v "/tmp/testhost:/bin/yadm:ro" \ -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" bash -c "script /tmp/script -q -c 'bash -l'; gzip < /tmp/script > /script.gz"
@echo @echo
@echo "Script saved to $$PWD/script.gz" @echo "Script saved to $$PWD/script.gz"

2
docker-compose.yml
View File

@ -4,4 +4,4 @@ services:
testbed: testbed:
volumes: volumes:
- .:/yadm:ro - .:/yadm:ro
image: yadm/testbed:2019-12-02 image: yadm/testbed:2020-01-20