Update testbed image to use GnuPG 2

pull/194/head
Tim Byrne 3 years ago
parent 3aefeeff0f
commit fe96cfce28
No known key found for this signature in database
GPG Key ID: 14DB4FC2465A4B12
  1. 4
      .travis.yml
  2. 5
      Dockerfile
  3. 4
      Makefile
  4. 2
      docker-compose.yml

@ -3,6 +3,6 @@ language: minimal
services:
- docker
before_install:
- docker pull yadm/testbed:2019-09-25
- docker pull yadm/testbed:2019-12-02
script:
- docker run -t --rm -v "$PWD:/yadm:ro" yadm/testbed:2019-09-25
- docker run -t --rm -v "$PWD:/yadm:ro" yadm/testbed:2019-12-02

@ -19,7 +19,7 @@ RUN \
curl \
expect \
git \
gnupg1 \
gnupg \
lsb-release \
make \
python3-pip \
@ -35,9 +35,6 @@ RUN pip3 install \
yamllint==1.17.0 \
;
# Force GNUPG version 1 at path /usr/bin/gpg
RUN ln -fs /usr/bin/gpg1 /usr/bin/gpg
# Create a flag to identify when running inside the yadm testbed
RUN touch /.yadmtestbed

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

@ -4,4 +4,4 @@ services:
testbed:
volumes:
- .:/yadm:ro
image: yadm/testbed:2019-09-25
image: yadm/testbed:2019-12-02

Loading…
Cancel
Save