Jenkins file fix

Dockerfile

@@ -1,10 +1,7 @@
-FROM docker.valuya.be/apache2:28
+FROM docker.charlyghislain.com/front-apache:2.4.39-a
 ARG  CLANG=en
 
-RUN a2ensite default \
- && a2enmod rewrite
-
-ADD docker/app-content.conf /etc/apache2/
+ADD docker/httpd.conf /var/run/httpd/charlyghislaindotcom.conf
 ADD dist/${CLANG}/ /var/www/html/
 
 ENV LANG=$CLANG

Jenkinsfile

@@ -54,14 +54,14 @@ pipeline {
                 container('docker') {
                   unstash(name: 'dist')
                   script {
-                    VERSION = sh(script: 'head -n1 dist/.version', returnStdout: true).trim()
-                    def fr = docker.build("${params.REPO}/${params.IMAGE}-fr:${VERSION}", "--build-arg CLANG=fr .")
-                    def en = docker.build("${params.REPO}/${params.IMAGE}-en:${VERSION}", "--build-arg CLANG=en .")
+                      VERSION = sh(script: 'head -n1 dist/.version', returnStdout: true).trim()
+                      def fr = docker.build("${params.REPO}/${params.IMAGE}-fr:${VERSION}", "--build-arg CLANG=fr .")
+                      def en = docker.build("${params.REPO}/${params.IMAGE}-en:${VERSION}", "--build-arg CLANG=en .")
 
-                    fr.push()
-                    fr.push('latest')
-                    en.push()
-                    en.push('latest')
+                      fr.push()
+                      fr.push('latest')
+                      en.push()
+                      en.push('latest')
                   }
                 }
             }

docker/app-content.conf

@@ -1,9 +0,0 @@
-Options -Indexes -Multiviews
-
-RewriteEngine on
-RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f [OR]
-RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d
-RewriteRule ^ - [L]
-
-RewriteRule ^(.*)$ /index.html [NC,L]
-

docker/httpd.conf

@@ -0,0 +1,55 @@
+
+<Directory "/var/www/fr">
+    Options -Indexes +FollowSymLinks
+    AllowOverride All
+    Require all granted
+
+    RewriteEngine on
+
+    # If an existing asset or directory is requested go to it as it is
+    RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f [OR]
+    RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d
+    RewriteRule ^ - [L]
+
+    # If the requested resource doesn't exist, use index.html
+    RewriteCond %{REQUEST_URI} "!=/index.html" [NC]
+    RewriteRule ^ /index.html [L]
+</Directory>
+
+
+
+<Directory "/var/www/en">
+    Options -Indexes +FollowSymLinks
+    AllowOverride All
+    Require all granted
+
+    RewriteEngine on
+
+    # If an existing asset or directory is requested go to it as it is
+    RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f [OR]
+    RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d
+    RewriteRule ^ - [L]
+
+    # If the requested resource doesn't exist, use index.html
+    RewriteCond %{REQUEST_URI} "!=/index.html" [NC]
+    RewriteRule ^ /index.html [L]
+</Directory>
+
+
+
+<Directory "/var/www">
+    Options -Indexes +FollowSymLinks
+    AllowOverride All
+    Require all granted
+
+    RewriteEngine on
+
+    # If an existing asset or directory is requested go to it as it is
+    RewriteCond %{REQUEST_URI} "^=/fr/"
+    RewriteCond %{REQUEST_URI} "^=/en/"
+    RewriteRule ^ - [L]
+
+    RewriteRule ^ /fr/ [L,R]
+</Directory>
+
+