use tomcat8 made in alkante

.gitignore

@@ -75,7 +75,7 @@ local.properties
 ## NetBeans
 ##############################
 nbproject/private/
-build/
+/build/
 nbbuild/
 dist/
 nbdist/

cicd/build/docker-prod/web/Dockerfile

-FROM tomcat:8-jdk8 
-
-RUN apt update; \
-  apt install -y ca-certificates-java
-
-## Not delpoy the geosource-overlay-3.10.4-0.war but the unziped one in docker
-COPY --chown=root:root ./target/geosource-overlay-3.10.4-0 /usr/local/tomcat/webapps/geonetwork
-
-#COPY --chown=root:root ./etc/geosource-overlay-3.10.4-0 /etc/geosource-overlay-3.10.4-0
\ No newline at end of file
+FROM docker.alkante.com/alk-tomcat:8
+COPY --chown=tomcat8:tomcat8 ./target/geosource-overlay-3.10.4-0 /var/lib/tomcat8/webapps/geonetwork
+USER root
+RUN chown -R www-data:www-data /var/lib/tomcat8/
+RUN chown -R root:www-data /etc/tomcat8
+RUN chown -R www-data:www-data /var/cache/tomcat8
+RUN chown -R www-data:www-data /tmp/tomcat8
+RUN chown -R www-data:www-data /var/log/tomcat8/
+USER www-data

cicd/dev/docker-compose.yml

 version: '3.5'
+
+networks:
+  prodige:
+    name: prodige
+    external: true
+
 services:
-  jpr_prodige_geonetwork_dev_web:
-    image: jpr_prodige_geonetwork_dev_web
+  jpr_prodige_geonetwork_web:
+    image: jpr_prodige_geonetwork_web
     build: ./web
-    container_name: jpr_prodige_geonetwork_dev_web
+    container_name: jpr_prodige_geonetwork_web
+    environment:
+      - JAVA_OPTS="-Djavax.net.ssl.keyStore=/etc/ssl/keystore.jks" "-Djavax.net.ssl.keyStorePassword=secret" "-Djavax.net.ssl.trustStore=/etc/ssl/truststore.jks" "-Djavax.net.ssl.trustStorePassword=secret"
+      #- JAVA_OPTS="-Djavax.net.ssl.trustStore=/etc/ssl/keystore.jks" "-Djavax.net.ssl.trustStorePassword=secret" "-Djavax.net.debug=ssl,handshake"
     volumes:
-      - ../../target/geosource-overlay-3.10.4-0.war:/usr/local/tomcat/webapps/geonetwork.war
-    #  - ../../etc/cas:/etc/cas
-    ports:
-      - "8080:8080"
+      - ./../../target/geosource-overlay-3.10.4-0/:/var/lib/tomcat8/webapps/geonetwork
+      - ./../../../pr_prodige/data/cas/keystore/keystore.jks:/etc/ssl/keystore.jks
+      - ./../../../pr_prodige/data/cas/keystore/truststore.jks:/etc/ssl/truststore.jks
+      - ./../../../pr_prodige/data/geonetwork/conf/server.xml:/etc/tomcat8/server.xml
+      - ./../../../pr_prodige/data/geonetwork/WEB-INF/config-overrides-prod.xml:/var/lib/tomcat8/webapps/geonetwork/WEB-INF/config-overrides-prod.xml
+      - ./../../../pr_prodige/data/geonetwork/WEB-INF/config-overrides.properties:/var/lib/tomcat8/webapps/geonetwork/WEB-INF/config-overrides.properties
+      - ./../../../pr_prodige/data/geonetwork/codelist:/var/lib/tomcat8/webapps/geonetwork/WEB-INF/data/config/codelist   # Persistence data
+      - ./../../../pr_prodige/data/geonetwork/data:/var/lib/tomcat8/webapps/geonetwork/WEB-INF/data/data # Persistence data
     networks:
-      default:
+      prodige:
         aliases:
-          - jpr_prodige_geonetwork_web
-networks:
-  default:
-    name: jpr_prodige_geonetwork_network
-
-#networks:
-#  default:
-#    name: prodige
-#    external: true
\ No newline at end of file
+          - prodige-geonetwork

cicd/dev/docker-compose_with_release.yml

-version: '3.5'
-
-networks:
-  prodige:
-    name: prodige
-    external: true
-
-services:
-  jpr_prodige_geonetwork_web:
-    image: jpr_prodige_geonetwork_web
-    build: ./web
-    container_name: jpr_prodige_geonetwork_web
-    environment:
-      - JAVA_OPTS="-Djavax.net.ssl.keyStore=/etc/ssl/keystore.jks" "-Djavax.net.ssl.keyStorePassword=secret" "-Djavax.net.ssl.trustStore=/etc/ssl/truststore.jks" "-Djavax.net.ssl.trustStorePassword=secret"
-      #- JAVA_OPTS="-Djavax.net.ssl.trustStore=/etc/ssl/keystore.jks" "-Djavax.net.ssl.trustStorePassword=secret" "-Djavax.net.debug=ssl,handshake"
-    volumes:
-      #      - ./../../target/geosource-overlay-3.10.4-0.war:/usr/local/tomcat/webapps/geonetwork.war
-      - ./../../target/geosource-overlay-3.10.4-0/:/usr/local/tomcat/webapps/geonetwork/
-      - ./../../../pr_prodige/data/cas/keystore/keystore.jks:/etc/ssl/keystore.jks
-      - ./../../../pr_prodige/data/cas/keystore/truststore.jks:/etc/ssl/truststore.jks
-      - ./../../../pr_prodige/data/geonetwork/conf/server.xml:/usr/local/tomcat/conf/server.xml
-      - ./../../../pr_prodige/data/geonetwork/WEB-INF/config-overrides-prod.xml:/usr/local/tomcat/webapps/geonetwork/WEB-INF/config-overrides-prod.xml
-      - ./../../../pr_prodige/data/geonetwork/WEB-INF/config-overrides.properties:/usr/local/tomcat/webapps/geonetwork/WEB-INF/config-overrides.properties
-#      - ./../../../pr_prodige/data/geonetwork/WEB-INF/config-spring-geonetwork.xml:/usr/local/tomcat/webapps/geonetwork/WEB-INF/config-spring-geonetwork.xml
-#      - ./../../../pr_prodige/data/geonetwork/WEB-INF/config-security/config-security-cas.xml:/usr/local/tomcat/webapps/geonetwork/WEB-INF/config-security/config-securityconfig-security-cas.xml
-#      - ./../../../pr_prodige/data/geonetwork/WEB-INF/config-security/config-security.properties:/usr/local/tomcat/webapps/geonetwork/WEB-INF/config-security/config-securityconfig-security.properties
-      - ./../../../pr_prodige/data/geonetwork/codelist:/usr/local/tomcat/webapps/geonetwork/WEB-INF/data/config/codelist   # Persistence data
-      - ./../../../pr_prodige/data/geonetwork/data:/usr/local/tomcat/webapps/geonetwork/WEB-INF/data/data # Persistence data
-    networks:
-      prodige:
-        aliases:
-          - prodige-geonetwork