diff --git a/Dockerfile b/Dockerfile index ac9f62c..a03a187 100755 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,7 @@ FROM httpd:2.4 RUN apt-get update RUN apt-get -y install libapache2-mod-wsgi-py3 python3 python3-pip COPY src/requirements.txt /var/www/jc/requirements.txt +RUN pip3 install --upgrade pip --break-system-packages RUN pip3 install -r /var/www/jc/requirements.txt || pip3 install --break-system-packages -r /var/www/jc/requirements.txt COPY --chown=www-data:www-data config/httpd.conf /usr/local/apache2/conf/httpd.conf COPY --chown=www-data:www-data src/ /var/www/jc diff --git a/Jenkinsfile b/Jenkinsfile index f800e87..6d91a3b 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,6 +39,7 @@ pipeline { stage('Security scan') { steps { + sh "docker kill sectest && docker rm sectest" sh "docker run -d --name sectest registry.jakecharman.co.uk/jakecharman.co.uk:$BUILD_NUMBER" sh "docker exec sectest pip3 install pip-audit --break-system-packages" sh "docker exec sectest pip-audit"