Skip to content

Commit

Permalink
[ALS-5052] Update to use docker tomcat image (#82)
Browse files Browse the repository at this point in the history
  • Loading branch information
ramari16 authored Sep 22, 2023
1 parent a43a209 commit e8c62bc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 51 deletions.
13 changes: 2 additions & 11 deletions docker/pic-sure-hpds/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,2 @@
FROM docker.io/alpine:3.16

RUN apk add --no-cache --purge -uU bash && rm -rf /var/cache/apk/* /tmp/*

RUN apk add --no-cache --purge -uU curl wget unzip

RUN apk add --no-cache --purge openjdk11

ADD hpds-war-1.0-SNAPSHOT-war-exec.jar /hpds.jar

EXPOSE 8080
FROM tomcat:9-jre11-openjdk-slim
ADD hpds-war-1.0-SNAPSHOT.war /usr/local/tomcat/webapps/ROOT.war
46 changes: 6 additions & 40 deletions war/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,6 @@
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.0</version>
<executions>
<execution>
<id>default-cli</id>
<goals>
<goal>run</goal>
</goals>
<configuration>
<port>13000</port>
<path>/jaxrs-service</path>
<useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
<jpda>true</jpda>
<systemProperties>
<JAVA_OPTS>-Xms256m -Xmx512m</JAVA_OPTS>
</systemProperties>
</configuration>
</execution>
</executions>
<configuration>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down Expand Up @@ -90,22 +66,12 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<executions>
<execution>
<id>tomcat-run</id>
<goals>
<goal>exec-war-only</goal>
</goals>
<phase>package</phase>
<configuration>
<attachArtifact>true</attachArtifact>
<buildDirectory>../docker/pic-sure-hpds</buildDirectory>
<path>/</path>
</configuration>
</execution>
</executions>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.3.1</version>
<configuration>
<outputDirectory>docker/pic-sure-hpds</outputDirectory>
</configuration>
</plugin>
</plugins>
</build>
Expand Down

0 comments on commit e8c62bc

Please sign in to comment.