Updated docker build

.gitlab-ci.yml

@@ -35,6 +35,7 @@ package genesys branch:
   <<:                     *maven_package
   stage:                  package
   when:                   manual
+  allow_failure:          false
   except:
     - master
     - tags
@@ -85,6 +86,7 @@ dockerize genesys branch:
   dependencies:
     - package genesys branch
   when:                   manual
+  allow_failure:          false
   except:
     - master
     - tags
@@ -94,6 +96,7 @@ deploy for review:
   stage:                  deploy
   image:                  docker:latest
   when:                   manual
+  allow_failure:          false
   environment:
     name:                 review/$CI_COMMIT_REF_SLUG
     url:                  https://${CI_COMMIT_REF_SLUG}.review.genesys-pgr.org

docker/Dockerfile

@@ -7,25 +7,23 @@ LABEL maintainer "Matija Obreza <matija.obreza@croptrust.org>"
 
 ENV USER=jetty \
 	GENESYS_DATA=/data/genesys \
-	JETTY_BASE=/var/lib/jetty/ \
+	JETTY_BASE=/var/lib/jetty \
 	GENESYS_WAR='genesys2-server*war'
 
 WORKDIR ${JETTY_BASE}
 
-RUN mkdir -p $GENESYS_DATA \
-		&& chown ${USER}.${USER} ${GENESYS_DATA}
+# Update jetty configuration
+COPY jetty ${JETTY_BASE}/
 
-# RUN echo 'Copying genesys-server webapps ...'
-COPY webapps ${JETTY_BASE}/webapps
+RUN mkdir -p ${GENESYS_DATA} \
+		&& chown ${USER}.${USER} ${GENESYS_DATA}
 
-# RUN echo "Downloading ${GENESYS_WAR}"
+# Add war file to the setup
 COPY ${GENESYS_WAR} ${JETTY_BASE}/webapps/genesys2-server.war
 
-# RUN echo 'Copying genesys.properties to ' ${JETTY_BASE}
-COPY genesys.properties ${JETTY_BASE}/resources/genesys.properties
-
-# list image contents
+# List image contents
 RUN chmod go+r ${JETTY_BASE}/webapps/genesys2-server.war \
 		&& find ${JETTY_BASE} -type f -exec ls -la {} \;
 
+# Exposed data volumes
 VOLUME /data/genesys