From 8576ab07142c0cd339910742d4e200c8509df4cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20Keskis=C3=A4rkk=C3=A4?= Date: Tue, 24 Sep 2024 14:39:35 +0200 Subject: [PATCH] update hefquin-docker to build the uber war --- hefquin-docker/Dockerfile | 5 ++++- hefquin-docker/docker-compose.yml | 15 +++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/hefquin-docker/Dockerfile b/hefquin-docker/Dockerfile index 775ab730a..3ea7a1e74 100644 --- a/hefquin-docker/Dockerfile +++ b/hefquin-docker/Dockerfile @@ -23,7 +23,10 @@ RUN sh -c '\ else \ echo "No specific tag supplied, using the latest version"; \ fi' -RUN mvn clean package + +# Build only the uber war +RUN mvn clean install +RUN mvn package -pl hefquin-service -P build-war # # Use tomcat:latest for running FROM tomcat:latest diff --git a/hefquin-docker/docker-compose.yml b/hefquin-docker/docker-compose.yml index 59616c0f7..4ae6dd87e 100644 --- a/hefquin-docker/docker-compose.yml +++ b/hefquin-docker/docker-compose.yml @@ -11,11 +11,10 @@ services: # TAG: docker-test ports: - "8080:8080" - volumes: - ### If you want to use configuration files other than the default ones - ### or a federation description other than the default one, uncomment - ### the following three lines and change their respective first parts - ### to refer to the files that you want to use. - #- ../hefquin-service/src/main/resources/config.properties:/usr/local/tomcat/webapps/ROOT/config.properties - #- ../hefquin-service/src/main/resources/DefaultEngineConf.ttl:/usr/local/tomcat/webapps/ROOT/ExampleEngineConf.ttl - #- ../hefquin-service/src/main/resources/DefaultFedConf.ttl:/usr/local/tomcat/webapps/ROOT/ExampleFedConf.ttl \ No newline at end of file + ### If you want to use configuration files other than the default ones + ### or a federation description other than the default one, uncomment + ### the following three lines and change their respective first parts + ### to refer to the files that you want to use. + #volumes: + #- ../hefquin-service/src/main/resources/DefaultEngineConf.ttl:/usr/local/tomcat/webapps/ROOT/DefaultEngineConf.ttl + #- ../hefquin-service/src/main/resources/DefaultFedConf.ttl:/usr/local/tomcat/webapps/ROOT/DefaultFedConf.ttl \ No newline at end of file