upgrade from fabric8 to jkube

This commit is contained in:
2023-09-05 15:06:38 -04:00
parent fd6866da82
commit 69701fba42
3 changed files with 11 additions and 11 deletions

View File

@@ -33,12 +33,12 @@ RUN mkdir -p /var/lib/jvm && cd /var/lib/jvm && \
mkdir lib lib-extra1 lib-extra2 lib-extra3 lib-extra4 lib-extra5 lib-extra6 lib-extra7 mkdir lib lib-extra1 lib-extra2 lib-extra3 lib-extra4 lib-extra5 lib-extra6 lib-extra7
# Add our Docker container initialization scripts # Add our Docker container initialization scripts
ADD setenv.sh /usr/local/bin/${project.artifactId}-setenv.sh ADD maven/target/setenv.sh /usr/local/bin/${dcevm.prefix}-setenv.sh
ADD docker-entrypoint.sh /usr/local/bin ADD maven/target/docker-entrypoint.sh /usr/local/bin
RUN chmod 755 /usr/local/bin/docker-entrypoint.sh RUN chmod 755 /usr/local/bin/docker-entrypoint.sh
# Add our default hotswap configuration; may be overwritten in dev/classes* volumes # Add our default hotswap configuration; may be overwritten in dev/classes* volumes
ADD hotswap-agent.properties /var/lib/jvm/lib ADD maven/target/hotswap-agent.properties /var/lib/jvm/lib
# Listening for Java debugger traffic # Listening for Java debugger traffic
EXPOSE 8000 EXPOSE 8000

View File

@@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
. /usr/local/bin/java-dcevm-hotswap-setenv.sh . /usr/local/bin/${dcevm.prefix}-setenv.sh
JAVA_CP="/var/lib/jvm/lib:/var/lib/jvm/lib/*" JAVA_CP="/var/lib/jvm/lib:/var/lib/jvm/lib/*"
JAVA_CP="${JAVA_CP}:/var/lib/jvm/dev/classes:/var/lib/jvm/dev/classes-extra1:/var/lib/jvm/dev/classes-extra2:/var/lib/jvm/dev/classes-extra3:/var/lib/jvm/dev/classes-extra4:/var/lib/jvm/dev/classes-extra5:/var/lib/jvm/dev/classes-extra6:/var/lib/jvm/dev/classes-extra7" JAVA_CP="${JAVA_CP}:/var/lib/jvm/dev/classes:/var/lib/jvm/dev/classes-extra1:/var/lib/jvm/dev/classes-extra2:/var/lib/jvm/dev/classes-extra3:/var/lib/jvm/dev/classes-extra4:/var/lib/jvm/dev/classes-extra5:/var/lib/jvm/dev/classes-extra6:/var/lib/jvm/dev/classes-extra7"

14
pom.xml
View File

@@ -12,6 +12,7 @@
<!-- See: https://hub.docker.com/_/ubuntu --> <!-- See: https://hub.docker.com/_/ubuntu -->
<!-- This has very little impact and may be replaced --> <!-- This has very little impact and may be replaced -->
<ubuntu.version>20.04</ubuntu.version> <ubuntu.version>20.04</ubuntu.version>
<dcevm.prefix>${project.artifactId}</dcevm.prefix>
<!-- The version of Java DCEVM to use for executing Apache Tomcat --> <!-- The version of Java DCEVM to use for executing Apache Tomcat -->
<!-- See: https://github.com/TravaOpenJDK/trava-jdk-11-dcevm/releases --> <!-- See: https://github.com/TravaOpenJDK/trava-jdk-11-dcevm/releases -->
@@ -48,7 +49,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>3.2.0</version> <version>3.3.1</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>
@@ -63,9 +64,9 @@
</plugin> </plugin>
<!-- This plugin build and pushes the Docker image --> <!-- This plugin build and pushes the Docker image -->
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>org.eclipse.jkube</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>kubernetes-maven-plugin</artifactId>
<version>4.4.0</version> <version>1.14.0</version>
<configuration> <configuration>
<images> <images>
<image> <image>
@@ -74,7 +75,6 @@
</image> </image>
</images> </images>
<contextDir>${project.build.directory}</contextDir> <contextDir>${project.build.directory}</contextDir>
<buildStrategy>docker</buildStrategy>
<verbose>true</verbose> <verbose>true</verbose>
</configuration> </configuration>
<executions> <executions>
@@ -95,7 +95,7 @@
<!-- This plugin prevents the project from deploying to the Maven Repository, as it is pointless --> <!-- This plugin prevents the project from deploying to the Maven Repository, as it is pointless -->
<plugin> <plugin>
<artifactId>maven-deploy-plugin</artifactId> <artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0-M1</version> <version>3.1.1</version>
<configuration> <configuration>
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
@@ -107,7 +107,7 @@
<profile> <profile>
<id>no-docker</id> <id>no-docker</id>
<properties> <properties>
<fabric8.build.jib>true</fabric8.build.jib> <jkube.build.strategy>jib</jkube.build.strategy>
</properties> </properties>
</profile> </profile>
</profiles> </profiles>