Merge pull request #5 from stefanpartheym/master

Update Mendelson AS2 server version to 1.1b59

.env

@@ -1 +1,2 @@
 MENDELSON_VERSION=1.1b63
+JAVA_VERSION=11

Makefile

@@ -1,14 +1,23 @@
 include .env
 
+DOWNLOAD_BASE_URL=https://downloads.sourceforge.net/project/mec-as2
+DOWNLOAD_FILE=install_mendelson_opensource_as2_$(MENDELSON_VERSION).zip
+DOWNLOAD_PARAMS=ts=$(shell date +%s)
+DOWNLOAD_URL=$(DOWNLOAD_BASE_URL)/$(DOWNLOAD_FILE)?$(DOWNLOAD_PARAMS)
+
 .PHONY : image start
 
 image : image/mendelson-$(MENDELSON_VERSION).zip
-	docker build --build-arg MENDELSON_VERSION=$(MENDELSON_VERSION) -t saver/mendelson-as2:$(MENDELSON_VERSION) image
+	docker build \
+	--build-arg MENDELSON_VERSION=$(MENDELSON_VERSION) \
+	--build-arg JAVA_VERSION=$(JAVA_VERSION) \
+	-t saver/mendelson-as2:$(MENDELSON_VERSION) \
+	image
 
 image/mendelson-$(MENDELSON_VERSION).zip :
-	curl -L http://downloads.sourceforge.net/project/mec-as2/install_mendelson_opensource_as2_$(MENDELSON_VERSION).zip > $@
+	curl -L $(DOWNLOAD_URL) --output $@
 
 start :
 	docker-compose up -d
 	HTTP_PORT=$$(docker-compose port as2 8080 | cut -d: -f2);\
-	echo Use http://localhost:$${HTTP_PORT} to connect to your Mendelson AS2
+	echo Use http://localhost:$${HTTP_PORT} to connect to your Mendelson AS2

image/Dockerfile

@@ -4,9 +4,14 @@ MAINTAINER Dmitry Myasnikov <[email protected]>
 
 ENV MENDELSON_HOME /opt/mendelson/as2
 ARG MENDELSON_VERSION=1.1b51
-
-RUN yum install -y java-11-openjdk unzip tigervnc-server xorg-x11-server-Xvfb && \
-    yum clean all && mkdir -p $MENDELSON_HOME
+ARG JAVA_VERSION=1.8.0
+
+RUN yum install -y \
+    java-${JAVA_VERSION}-openjdk \
+    unzip \
+    tigervnc-server \
+    xorg-x11-server-Xvfb
+RUN yum clean all && mkdir -p $MENDELSON_HOME
 
 COPY custom $MENDELSON_HOME/custom
 

image/custom/runas2.sh

@@ -9,6 +9,12 @@ else
     echo "Workdir $WD is empty, performing preparation"
 fi
 
+# webas2 will crash if the file "database.acl" is not present in $WD
+if [ ! -f $WD/database.acl ]; then
+    echo "File database.acl not found. Using default."
+    cp $MENDELSON_HOME/database.acl $WD/database.acl
+fi
+
 if [ ! -f $WD/webpasswd ]; then
     echo "Web password file not found. Creating default."
     cp $MENDELSON_HOME/custom/webpasswd $WD/webpasswd
@@ -77,7 +83,7 @@ done
 cleanup() {
    if [ "$(pidof java)" ]; then
       echo "Gracefully stopping Mendelson AS2"
-      java -Xmx192M -Xms92M -classpath $CLASSPATH de.mendelson.comm.as2.AS2Shutdown; 
+      java -Xmx192M -Xms92M -classpath $CLASSPATH de.mendelson.comm.as2.AS2Shutdown;
    fi;
    for f in $(find /tmp/ -name ".X*-lock"); do
       num=$(echo $f | rev | cut -d'X' -f 1 | rev | cut -d- -f1)		#get display number
@@ -93,7 +99,7 @@ cleanup
 
 echo "$(cat $WD/vncpasswd)" > /tmp/passwd
 echo "$(cat $WD/vncpasswd)" >> /tmp/passwd
-vncpasswd < /tmp/passwd 
+vncpasswd < /tmp/passwd
 rm -f /tmp/passwd
 
 export DISPLAY=:1