From 75639c176c9d9cf1ca4cb1f8d262c8eaac796346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Guy=20S=C3=BC=C3=9F?= Date: Tue, 15 Jul 2025 11:08:38 +1000 Subject: [PATCH] refactoring: factor out full image build components. --- Dockerfile | 10 ---------- Dockerfile.full | 11 +++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 Dockerfile.full diff --git a/Dockerfile b/Dockerfile index 717d973..b00aaea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,16 +34,6 @@ COPY templates/ templates/ COPY static/ static/ COPY tests/ tests/ -# Ensure /tmp, /app/h2-data, /app/static/uploads, and /app/logs are writable -RUN mkdir -p /tmp /app/h2-data /app/static/uploads /app/logs && chmod 777 /tmp /app/h2-data /app/static/uploads /app/logs - -# Copy pre-built HAPI WAR and configuration -COPY hapi-fhir-jpaserver/target/ROOT.war /usr/local/tomcat/webapps/ -COPY hapi-fhir-jpaserver/target/classes/application.yaml /usr/local/tomcat/conf/ -COPY hapi-fhir-jpaserver/target/classes/application.yaml /app/config/application.yaml -COPY hapi-fhir-jpaserver/target/classes/application.yaml /usr/local/tomcat/webapps/app/config/application.yaml -COPY hapi-fhir-jpaserver/custom/ /usr/local/tomcat/webapps/custom/ - # Install supervisord RUN pip install supervisor diff --git a/Dockerfile.full b/Dockerfile.full new file mode 100644 index 0000000..ef3c0bc --- /dev/null +++ b/Dockerfile.full @@ -0,0 +1,11 @@ +FROM flare.lite + +# Ensure /tmp, /app/static/uploads, and /app/logs are writable +RUN mkdir -p /tmp /app/h2-data /app/static/uploads /app/logs && chmod 777 /tmp /app/h2-data /app/static/uploads /app/logs + +# Copy pre-built HAPI WAR and configuration +COPY hapi-fhir-jpaserver/target/ROOT.war /usr/local/tomcat/webapps/ +COPY hapi-fhir-jpaserver/target/classes/application.yaml /usr/local/tomcat/conf/ +COPY hapi-fhir-jpaserver/target/classes/application.yaml /app/config/application.yaml +COPY hapi-fhir-jpaserver/target/classes/application.yaml /usr/local/tomcat/webapps/app/config/application.yaml +COPY hapi-fhir-jpaserver/custom/ /usr/local/tomcat/webapps/custom/ \ No newline at end of file