From df3a79db88aff0114f8d4a3aa7be2fb6d4a3a926 Mon Sep 17 00:00:00 2001
From: Ruben Vila-Morales <rmorales@oteemo.com>
Date: Thu, 28 May 2020 14:24:22 -0400
Subject: [PATCH] removed unecessary Apache AllowOverride and changed
 Jenkinsfile version

---
 Dockerfile  | 1 -
 Jenkinsfile | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4b18bcc..c43141f 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 6312f31..7f1f3c2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,2 +1,2 @@
 @Library('DCCSCR@master') _
-dccscrPipeline(version: "6.13.10")
+dccscrPipeline(version: "7.4.0")
-- 
GitLab