Dockerize env variable. Tests

Author: vjrj

src/main/docker/Dockerfile

@@ -2,19 +2,18 @@ FROM livingatlases/java-11-base:1.0.0
 
 # Lint with:
 # docker run --rm -i hadolint/hadolint < Dockerfile
-# Test with:
-# container-structure-test test --driver tar --image livingatlases/java-11-base:1.0.0 --config container-test.yaml
 
 # Args
 ARG APP_ARTIFACT=collectory
 ARG USER=collectory
 ARG WAR_FILE=./build/libs/collectory-*.war
+ARG DOCKERIZE_ARGS="-wait tcp://living-atlas-collectory-mysql:3306 -timeout 120s"
 
 # Env variables
+ENV SERVER_PORT="8080"
 ENV WAR_FILE_ENV=${WAR_FILE}
 ENV JAVA_OPTS="-Djava.awt.headless=true -Xmx256m -Xms256m -XX:+UseConcMarkSweepGC -Dlog4j2.formatMsgNoLookups=true"
-ENV MYSQL_HOST="living-atlas-collectory-mysql"
-ENV SERVER_PORT="8080"
+ENV DOCKERIZE_OPTS=${DOCKERIZE_ARGS}
 
 # Directories and perms
 RUN mkdir -p /data/$APP_ARTIFACT && \
@@ -28,7 +27,5 @@ RUN chown -R $USER:$USER /opt/atlas/$APP_ARTIFACT
 
 USER $USER
 EXPOSE $SERVER_PORT
-# Lint with:
-# docker run --rm -i hadolint/hadolint < Dockerfile
 # hadolint ignore=DL3025
-ENTRYPOINT dockerize -wait tcp://$MYSQL_HOST:3306 -timeout 120s sh -c "java $JAVA_OPTS -jar app.war"
+ENTRYPOINT dockerize $DOCKERIZE_OPTS sh -c "java $JAVA_OPTS -jar app.war"

src/main/docker/container-test.yaml

@@ -0,0 +1,7 @@
+# Run with: container-structure-test test --driver tar --image livingatlases/collectory:latest --config src/main/docker/container-test.yaml 
+schemaVersion: 2.0.0
+fileExistenceTests:
+- name: 'war'
+  path: '/opt/atlas/collectory/app.war'
+  shouldExist: true
+  permissions: '-rw-rw-r--'