diff --git a/Dockerfile.test b/Dockerfile.test index 234b43e..5676f43 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -1,6 +1,6 @@ ARG SCHEME=chibi ARG IMAGE=chibi:head -FROM schemers/${IMAGE} +FROM docker.io/schemers/${IMAGE} RUN apt-get update && apt-get install -y \ build-essential \ make \ diff --git a/Jenkinsfile b/Jenkinsfile index 6afa659..87373ea 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { stage('Test R6RS implementations') { steps { script { - def r6rs_implementations = sh(script: 'docker run retropikzel1/compile-r7rs bash -c "compile-r7rs --list-r6rs-schemes"', returnStdout: true).split() + def r6rs_implementations = sh(script: 'podman run docker.io/retropikzel1/compile-r7rs bash -c "compile-r7rs --list-r6rs-schemes"', returnStdout: true).split() parallel r6rs_implementations.collectEntries { SCHEME -> [(SCHEME): { stage("${SCHEME} R6RS") { @@ -26,8 +26,8 @@ pipeline { if("${SCHEME}" == "chicken") { DOCKERIMG="chicken:5" } - sh "docker build -f Dockerfile.test --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=compile-r7rs-test-${SCHEME} ." - sh "docker run -v ${WORKSPACE}:/workdir -w /workdir -t compile-r7rs-test-${SCHEME} sh -c \"make && make install && make SCHEME=${SCHEME} test-r6rs\"" + sh "podman build -f Dockerfile.test --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=compile-r7rs-test-${SCHEME} ." + sh "podman run -v ${WORKSPACE}:/workdir -w /workdir -t compile-r7rs-test-${SCHEME} sh -c \"make && make install && make SCHEME=${SCHEME} test-r6rs\"" } } } @@ -40,7 +40,7 @@ pipeline { stage('Test R7RS implementations') { steps { script { - def r7rs_implementations = sh(script: 'docker run retropikzel1/compile-r7rs bash -c "compile-r7rs --list-r7rs-schemes"', returnStdout: true).split() + def r7rs_implementations = sh(script: 'podman run retropikzel1/compile-r7rs bash -c "compile-r7rs --list-r7rs-schemes"', returnStdout: true).split() parallel r7rs_implementations.collectEntries { SCHEME -> [(SCHEME): { stage("${SCHEME} R7RS") { @@ -49,8 +49,8 @@ pipeline { if("${SCHEME}" == "chicken") { DOCKERIMG="chicken:5" } - sh "docker build -f Dockerfile.test --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=compile-r7rs-test-${SCHEME} ." - sh "docker run -v ${WORKSPACE}:/workdir -w /workdir -t compile-r7rs-test-${SCHEME} sh -c \"make && make install && make SCHEME=${SCHEME} test-r7rs\"" + sh "podman build -f Dockerfile.test --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=compile-r7rs-test-${SCHEME} ." + sh "podman run -v ${WORKSPACE}:/workdir -w /workdir -t compile-r7rs-test-${SCHEME} sh -c \"make && make install && make SCHEME=${SCHEME} test-r7rs\"" } } }