update matchbox port

Author: aschey-forpeople

apps/bfd-model-idr/compile_resources.py

@@ -6,7 +6,7 @@
 
 import requests
 
-MATCHBOX_SERVER = "http://localhost:8080/matchboxv3"
+MATCHBOX_SERVER = "http://localhost:18080/matchboxv3"
 
 
 def run_command(cmd, cwd=None):

apps/bfd-model-idr/docker-compose.yml

@@ -4,12 +4,30 @@ services:
     container_name: matchbox
     restart: on-failure
     ports:
-      - "8080:8080"
+      - "18080:8080"
     depends_on:
       - matchbox-db
-    entrypoint: ["java", "-Xms1G", "-Xmx4G", "-XX:+UseG1GC", "-XX:+UseCompressedOops", "-Xss512k", "-Dfhir.settings.path=/config/fhir-settings.json", "-Dspring.config.additional-location=optional:file:/config/application.yaml", "-jar", "/matchbox.jar"]
+    entrypoint:
+      [
+        "java",
+        "-Xms1G",
+        "-Xmx4G",
+        "-XX:+UseG1GC",
+        "-XX:+UseCompressedOops",
+        "-Xss512k",
+        "-Dfhir.settings.path=/config/fhir-settings.json",
+        "-Dspring.config.additional-location=optional:file:/config/application.yaml",
+        "-jar",
+        "/matchbox.jar",
+      ]
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8080/matchboxv3/actuator/health"]
+      test:
+        [
+          "CMD",
+          "curl",
+          "-f",
+          "http://localhost:8080/matchboxv3/actuator/health",
+        ]
       interval: 5s
       timeout: 5s
       retries: 30
@@ -34,8 +52,8 @@ services:
     ports:
       - "15432:5432"
     environment:
-      POSTGRES_DB: 'matchbox'
-      POSTGRES_USER: 'matchbox'
-      POSTGRES_PASSWORD: 'matchbox'     
+      POSTGRES_DB: "matchbox"
+      POSTGRES_USER: "matchbox"
+      POSTGRES_PASSWORD: "matchbox"
     volumes:
       - ./data:/var/lib/postgresql/data

apps/bfd-model-idr/setup_matchbox.py

@@ -78,7 +78,7 @@ def upload_resource(base_url, resource_json, session):
 
 def main():
     parser = argparse.ArgumentParser()
-    parser.add_argument("--url", default="http://localhost:8080/matchboxv3/fhir")
+    parser.add_argument("--url", default="http://localhost:18080/matchboxv3/fhir")
     parser.add_argument("--manifest", default="matchbox_profiles.txt")
     args = parser.parse_args()
 
@@ -88,7 +88,7 @@ def main():
     logger.info("Waiting for local matchbox server to start...")
     for _ in range(30):
         try:
-            if requests.get("http://matchbox:8080/matchboxv3/actuator/health", timeout=5).ok:
+            if requests.get("http://matchbox:18080/matchboxv3/actuator/health", timeout=5).ok:
                 break
         except requests.RequestException:
             pass