diff --git a/Dockerfile b/Dockerfile index 4b18bcc6116b4978eb54dc34a7da75aa637c2029..c43141f976d074111fd8a775b68d30daa5e4651a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,7 +56,6 @@ RUN ln -sf /dev/stderr /var/log/httpd/error_log && \ chown -R worker:worker /var/log/httpd && \ chown -R worker:worker /run/httpd && \ sed -i -e "s/Listen 80/Listen ${CONFLUENCE_LB_PUBLIC_PORT}\nServerName localhost/g" /etc/httpd/conf/httpd.conf && \ - sed -i -e "s/AllowOverride\s*None/AllowOverride All/ig" /etc/httpd/conf/httpd.conf && \ echo "Include /work-private/loadbalancer-virtual-host.conf" >> /etc/httpd/conf/httpd.conf # diff --git a/Jenkinsfile b/Jenkinsfile index 6312f314664ef1a788318aebe4803a8b2e522169..7f1f3c22ba8a2c4ca6dc87097dd275ab529d2687 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "6.13.10") +dccscrPipeline(version: "7.4.0")