Merge branch 'docker' of github.com:ahdis/asbestos into ahdis-docker

.gitignore

@@ -151,3 +151,5 @@ it-tests/src/test/resources/external_cache/ImageCache/sim/idc-dataset-a/1.3.6.1.
 
 #HAPI specific
 derby.log
+
+dist

Dockerfile

@@ -0,0 +1,33 @@
+FROM adoptopenjdk/openjdk11-openj9:alpine-slim
+MAINTAINER oliver egger <oliver.egger@ahdis.ch>
+EXPOSE 7080
+EXPOSE 9743
+EXPOSE 9760
+EXPOSE 9770
+EXPOSE 9773
+
+RUN apk add --no-cache bash
+RUN apk add --no-cache findutils 
+
+# asbestos.zip must be currently provided from the release and be put in the dist directory
+# copy it from here https://github.com/usnistgov/asbestos/releases
+ADD ./dist/asbestos.zip .
+RUN unzip /asbestos.zip
+RUN rm /asbestos.zip
+
+ADD ./start.sh .
+
+RUN rm ./asbestos/tomcat/Toolkits/FhirToolkit/conf/service.properties
+ADD ./service.properties ./asbestos/tomcat/Toolkits/FhirToolkit/conf/
+
+RUN rm ./asbestos/tomcat/Toolkits/FhirToolkit/webapps/ROOT/serviceProperties.json
+ADD ./serviceProperties.json ./asbestos/tomcat/Toolkits/FhirToolkit/webapps/ROOT/
+
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
+
+ENTRYPOINT ./start.sh
+
+
+# docker build -t asbestos . 
+# docker run --name asbestos -p 9760:9760 -p 9770:9770 -p 9773:9773 -p 9743:9743 -p 7080:7080 asbestos 
+

service.properties

@@ -0,0 +1,53 @@
+##
+## This copy is only used by Asbestos-war --
+##
+
+## For Development values see the Properties section in the asbestos-war\pom.xml file.
+
+## For Production values see the Properties section in the asbestos-assembly\pom.xml file.
+
+## # FhirToolkit needs a separate service.properties file because we are presenting the user with the option to point to another instance of XdsToolkit effectively ignoring the copy of the XdsToolkit (and its toolkit.properties) which were supplied with the testing-tools distribution package.
+## Service.properties
+
+# TLS XdsToolkit base path should not end with a slash
+tlsXdsToolkitBase=http://ehealthsuisse.ihe-europe.net:9773/xdstools
+
+# Base path should not end with a slash
+xdsToolkitBase=http://ehealthsuisse.ihe-europe.net:9770/xdstools
+
+# Base path should not end with a slash
+fhirToolkitBase=http://ehealthsuisse.ihe-europe.net:9760/asbestos
+
+# Only for the HTTPS UI. Base path should not end with a slash
+httpsFhirToolkitBase=https:///ehealthsuisse.ihe-europe.net:9743/asbestos
+
+# UI can be HTTP or HTTPS. If HTTPS, a self-signed certificate must be trusted or a real certificate must be used. Home page path should not end with a slash
+fhirToolkitUIHomePage=http://ehealthsuisse.ihe-europe.net:9760
+
+# Fhir Toolkit Version
+fhirToolkitVersion=2.2.1
+
+# Base path should not end with a slash
+hapiFhirBase=http://ehealthsuisse.ihe-europe.net:7080/fhir
+
+# Base path should not end with a slash
+fhirValidationServer=http://ehealthsuisse.ihe-europe.net:7080/fhir
+
+# Patient server base. This value should be updated when running the Connectathon.
+patientServerBase=http://ehealthsuisse.ihe-europe.net:7080/fhir
+
+# FUTURE USE -- Empty capability statement from the HL7 FHIR site
+emptyCapabilityStatementFile=capabilitystatement/empty-capabilitystatement-base2.xml
+
+# MHD capability statement file
+mhdCapabilityStatementFile=capabilitystatement/capabilitystatement-fhirToolkitDocRecipientDocResponder.xml
+
+# MHD limited channel capability statement file
+limitedChannelCapabilityStatementFile=capabilitystatement/limitedChannelCapabilityStatement.xml
+
+# MHD comprehensive channel capability statement file
+xdsChannelCapabilityStatementFile=capabilitystatement/xdsChannelCapabilityStatement.xml
+
+# startup sessionId
+startUpSession=default
+

serviceProperties.json

@@ -0,0 +1,6 @@
+{
+ "httpsFhirToolkitBase": "https://fhirtoolkit.test:9743/asbestos",
+ "fhirToolkitBase": "http://ehealthsuisse.ihe-europe.net:9760/asbestos",
+ "projectVersion": "2.2.1",
+ "startUpSession": "default"
+}

start.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Helper File for Docker based deployment
+
+echo "changing to asbestos bin"
+cd ./asbestos/tomcat/bin
+echo "start"
+./start.sh
+echo "run"
+./catalina.sh run