Skip to content

Commit

Permalink
Fixes #336 - Merge rest and docker module
Browse files Browse the repository at this point in the history
  • Loading branch information
@mnriem
mnriem committed Aug 20, 2024
1 parent 3fff51e commit 0fb9828
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 47 deletions.
43 changes: 1 addition & 42 deletions docker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,46 +51,5 @@
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>docker</id>
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>${docker-maven-plugin.version}</version>
<configuration>
<createContainers>true</createContainers>
<images>
<image>
<alias>sphynx</alias>
<name>ghcr.io/manorrock/sphynx:%l</name>
<build>
<buildx>
<platforms>
<platform>linux/amd64</platform>
<platform>linux/arm64</platform>
</platforms>
</buildx>
<contextDir>${basedir}</contextDir>
<dockerFile>src/main/docker/Dockerfile</dockerFile>
</build>
</image>
</images>
</configuration>
<executions>
<execution>
<id>build</id>
<phase>install</phase>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
1 change: 0 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@
<modules>
<module>cli</module>
<module>desktop</module>
<module>docker</module>
<module>rest</module>
<module>shared</module>
</modules>
Expand Down
45 changes: 42 additions & 3 deletions rest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,16 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -111,4 +108,46 @@
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>docker</id>
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>${docker-maven-plugin.version}</version>
<configuration>
<createContainers>true</createContainers>
<images>
<image>
<alias>sphynx</alias>
<name>ghcr.io/manorrock/sphynx:%l</name>
<build>
<buildx>
<platforms>
<platform>linux/amd64</platform>
<platform>linux/arm64</platform>
</platforms>
</buildx>
<contextDir>${basedir}</contextDir>
<dockerFile>src/main/docker/Dockerfile</dockerFile>
</build>
</image>
</images>
</configuration>
<executions>
<execution>
<id>build</id>
<phase>install</phase>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion docker/src/main/docker/Dockerfile → rest/src/main/docker/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM ghcr.io/piranhacloud/webprofile:24.7.0
COPY target/wars/rest.war ROOT.war
COPY target/rest.war ROOT.war
USER root
RUN chown -R piranha:piranha /home/piranha
USER piranha
Expand Down

0 comments on commit 0fb9828

Please sign in to comment.