From 9f65314537e5ab6f63fbceba2a5aa6a300541b3f Mon Sep 17 00:00:00 2001
From: Ben Li-Sauerwine <bsauerwine@gmail.com>
Date: Tue, 14 Sep 2021 10:52:45 -0400
Subject: [PATCH] Adds ability to change HAPI FHIR JPA server's port with the
 environment variable server.port

---
 Dockerfile          | 2 --
 catalina.properties | 1 +
 server.xml          | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5250ad5..1739d66 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,6 +31,4 @@ COPY --from=build-hapi /tmp/hapi-fhir-jpaserver-starter/target/*.war /usr/local/
 COPY catalina.properties /usr/local/tomcat/conf/catalina.properties
 COPY server.xml /usr/local/tomcat/conf/server.xml
 
-EXPOSE 8080
-
 CMD ["catalina.sh", "run"]
diff --git a/catalina.properties b/catalina.properties
index 5277e74..73ed499 100644
--- a/catalina.properties
+++ b/catalina.properties
@@ -206,3 +206,4 @@ tomcat.util.buf.StringCache.byte.enabled=true
 #tomcat.util.buf.StringCache.cacheSize=5000
 
 org.apache.tomcat.util.digester.PROPERTY_SOURCE=org.apache.tomcat.util.digester.Digester$EnvironmentPropertySource
+server.port=8080
diff --git a/server.xml b/server.xml
index 0723e96..86a0ae3 100644
--- a/server.xml
+++ b/server.xml
@@ -39,7 +39,7 @@
          APR (HTTP/AJP) Connector: /docs/apr.html
          Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
     -->
-    <Connector port="8080" protocol="HTTP/1.1"
+    <Connector port="${server.port}" protocol="HTTP/1.1"
                connectionTimeout="20000"
                redirectPort="8443" 
                maxThreads="${server.tomcat.max-threads}"