upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-06 15:22:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Embed interactive console behavior in dockers

Browse source
This commit is contained in:
Adrien Ferrand 2020-06-26 23:15:12 +02:00
parent 636ce3af6e
commit e71f79ea93
7 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.azure-pipelines/templates/steps/tox-steps.yml
View file

@ -36,10 +36,6 @@ steps:
- bash: |
if [[ "${TOXENV}" == *"oldest"* ]]; then
tools/run_oldest_tests.sh
elif command -v unbuffer >/dev/null 2>&1; then
# Call to unbuffer ensures that docker command can be run with
# -it while tox is not executed from an interactive console.
unbuffer -p python -m tox
else
python -m tox
fi

2
certbot-compatibility-test/Dockerfile-apache
View file

@ -3,4 +3,4 @@ MAINTAINER Brad Warren <bmw@eff.org>
RUN apt-get install apache2 -y
ENTRYPOINT [ "certbot-compatibility-test", "-p", "apache" ]
CMD [ "script", "-c", "certbot-compatibility-test -p apache -c apache.tar.gz -vvvv" ]

2
certbot-compatibility-test/Dockerfile-nginx
View file

@ -3,4 +3,4 @@ MAINTAINER Brad Warren <bmw@eff.org>
RUN apt-get install nginx -y
ENTRYPOINT [ "certbot-compatibility-test", "-p", "nginx" ]
CMD [ "script", "-c", "certbot-compatibility-test -p nginx -c nginx.tar.gz -vv -aie" ]

2
letsencrypt-auto-source/Dockerfile.jessie
View file

@ -32,4 +32,4 @@ COPY . /home/lea/certbot/letsencrypt-auto-source
USER lea
WORKDIR /home/lea
CMD ["pytest", "-v", "-s", "certbot/letsencrypt-auto-source/tests"]
CMD ["script", "-c", "pytest -v -s certbot/letsencrypt-auto-source/tests"]

2
letsencrypt-auto-source/Dockerfile.redhat6
View file

@ -51,4 +51,4 @@ RUN cp /home/lea/certbot/letsencrypt-auto-source/tests/${REDHAT_DIST_FLAVOR}6_te
USER lea
WORKDIR /home/lea
CMD ["sudo", "certbot/letsencrypt-auto-source/tests/redhat6_tests.sh"]
CMD ["sudo", "script", "-c", "certbot/letsencrypt-auto-source/tests/redhat6_tests.sh"]

2
letsencrypt-auto-source/Dockerfile.xenial
View file

@ -33,4 +33,4 @@ COPY . /home/lea/certbot/letsencrypt-auto-source
USER lea
WORKDIR /home/lea
CMD ["pytest", "-v", "-s", "certbot/letsencrypt-auto-source/tests"]
CMD ["script", "-c", "pytest -v -s certbot/letsencrypt-auto-source/tests"]

12
tox.ini
View file

@ -170,7 +170,7 @@ commands =
commands =
docker build -t certbot-compatibility-test -f certbot-compatibility-test/Dockerfile .
docker build -t apache-compat -f certbot-compatibility-test/Dockerfile-apache .
docker run --rm -it apache-compat -c apache.tar.gz -vvvv
docker run --rm apache-compat
whitelist_externals =
docker
passenv =
@ -180,7 +180,7 @@ passenv =
commands =
docker build -t certbot-compatibility-test -f certbot-compatibility-test/Dockerfile .
docker build -t nginx-compat -f certbot-compatibility-test/Dockerfile-nginx .
docker run --rm -it nginx-compat -c nginx.tar.gz -vv -aie
docker run --rm nginx-compat
whitelist_externals =
docker
passenv =
@ -191,7 +191,7 @@ passenv =
commands =
python {toxinidir}/tests/modification-check.py
docker build -f letsencrypt-auto-source/Dockerfile.xenial -t lea letsencrypt-auto-source
docker run --rm -t -i lea
docker run --rm lea
whitelist_externals =
docker
passenv =
@ -203,7 +203,7 @@ passenv =
# readily available on the Wheezy Docker image.
commands =
docker build -f letsencrypt-auto-source/Dockerfile.jessie -t lea letsencrypt-auto-source
docker run --rm -t -i lea
docker run --rm lea
whitelist_externals =
docker
passenv = DOCKER_*
@ -213,7 +213,7 @@ passenv = DOCKER_*
# readily available on the CentOS 6 Docker image.
commands =
docker build -f letsencrypt-auto-source/Dockerfile.redhat6 --build-arg REDHAT_DIST_FLAVOR=centos -t lea letsencrypt-auto-source
docker run --rm -t -i lea
docker run --rm lea
whitelist_externals =
docker
passenv = DOCKER_*
@ -223,7 +223,7 @@ passenv = DOCKER_*
# readily available on the Oracle Linux 6 Docker image.
commands =
docker build -f letsencrypt-auto-source/Dockerfile.redhat6 --build-arg REDHAT_DIST_FLAVOR=oraclelinux -t lea letsencrypt-auto-source
docker run --rm -t -i lea
docker run --rm lea
whitelist_externals =
docker
passenv = DOCKER_*