diff options
| author | Jan Pazdziora <jpazdziora@redhat.com> | 2022-01-21 17:36:12 +0100 |
|---|---|---|
| committer | Jan Pazdziora <jpazdziora@redhat.com> | 2022-01-21 17:36:12 +0100 |
| commit | 75df8ed243f986d75d33d0d3c1d9f02579500ca4 (patch) | |
| tree | 88cb98874cd85c46f09fc8da69d4632301384790 | |
| parent | e8a63a170c9aff87622784851200f383d944daad (diff) | |
| download | mod_authnz_pam-75df8ed243f986d75d33d0d3c1d9f02579500ca4.tar.gz mod_authnz_pam-75df8ed243f986d75d33d0d3c1d9f02579500ca4.tar.xz mod_authnz_pam-75df8ed243f986d75d33d0d3c1d9f02579500ca4.zip | |
Revert "Workaround 1897493 / 1900021 -- test on docker with disabled seccomp, we have to move the build steps to docker run."
This reverts commit 63bea6d518f3d5d10384fa1530b805083c0f9478.
The latest dockers have updated seccomp policies.
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index a281a9b..099093e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,8 +28,6 @@ before_script: - if test -n "$centos" ; then sed -i "s#^FROM.*#FROM centos:$centos#" tests/Dockerfile ; fi script: -- if grep -q fedora tests/Dockerfile ; then sed -i 's/^RUN/# RUN/; s%^ENTRYPOINT .*%ENTRYPOINT [ "/usr/bin/sleep", "600" ]%' tests/Dockerfile ; fi - docker build -t mod_authnz_pam -f tests/Dockerfile . -- docker run $( grep -q fedora tests/Dockerfile && echo --security-opt=seccomp:unconfined ) --name mod_authnz_pam --rm -d mod_authnz_pam -- if grep -q fedora tests/Dockerfile ; then docker exec mod_authnz_pam tests/build.sh ; docker exec mod_authnz_pam tests/config.sh ; fi -- if grep -q fedora tests/Dockerfile ; then docker exec mod_authnz_pam /usr/sbin/httpd -DFOREGROUND ; fi & docker exec mod_authnz_pam tests/run.sh +- docker run --name mod_authnz_pam --rm -d mod_authnz_pam +- docker exec mod_authnz_pam tests/run.sh |