refactored; downgrade jkube to v1.16.2
This commit is contained in:
parent
7872db4ff8
commit
8fcceaa19d
@ -28,14 +28,14 @@ RUN cd /var/lib/tomcat/dev && \
|
|||||||
mkdir web web-extra1 web-extra2 web-extra3 web-extra4 web-extra5 web-extra6 web-extra7
|
mkdir web web-extra1 web-extra2 web-extra3 web-extra4 web-extra5 web-extra6 web-extra7
|
||||||
|
|
||||||
# Add our Docker container initialization script
|
# Add our Docker container initialization script
|
||||||
ADD maven/target/setenv.sh /usr/local/bin/${namespace.prefix}-setenv.sh
|
ADD maven/target/resources/setenv.sh /usr/local/bin/${namespace.prefix}-setenv.sh
|
||||||
COPY maven/target/docker-entrypoint.sh /usr/local/bin
|
COPY maven/target/resources/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 Apache Tomcat configuration
|
# Add our Apache Tomcat configuration
|
||||||
# This gives us dynamic injection points into the running webapps
|
# This gives us dynamic injection points into the running webapps
|
||||||
COPY maven/target/tomcat-context.xml /var/lib/tomcat/conf/context.xml
|
COPY maven/target/resources/tomcat-context.xml /var/lib/tomcat/conf/context.xml
|
||||||
ADD maven/target/hotswap-agent.properties /var/lib/tomcat/lib
|
ADD maven/target/resources/hotswap-agent.properties /var/lib/tomcat/lib
|
||||||
|
|
||||||
# Listening for HTTP (not HTTPS) traffic
|
# Listening for HTTP (not HTTPS) traffic
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
|
13
pom.xml
13
pom.xml
@ -29,14 +29,9 @@
|
|||||||
<build>
|
<build>
|
||||||
<resources>
|
<resources>
|
||||||
<resource>
|
<resource>
|
||||||
<directory>.</directory>
|
<directory>src/main/docker</directory>
|
||||||
<includes>
|
|
||||||
<include>*.sh</include>
|
|
||||||
<include>*.properties</include>
|
|
||||||
<include>*.xml</include>
|
|
||||||
</includes>
|
|
||||||
<filtering>true</filtering>
|
<filtering>true</filtering>
|
||||||
<targetPath>${project.build.directory}</targetPath>
|
<targetPath>${project.build.directory}/resources</targetPath>
|
||||||
</resource>
|
</resource>
|
||||||
</resources>
|
</resources>
|
||||||
<plugins>
|
<plugins>
|
||||||
@ -59,7 +54,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.eclipse.jkube</groupId>
|
<groupId>org.eclipse.jkube</groupId>
|
||||||
<artifactId>kubernetes-maven-plugin</artifactId>
|
<artifactId>kubernetes-maven-plugin</artifactId>
|
||||||
<version>1.18.0</version>
|
<version>1.16.2</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<images>
|
<images>
|
||||||
<image>
|
<image>
|
||||||
@ -67,7 +62,7 @@
|
|||||||
<registry>${image.registry}</registry>
|
<registry>${image.registry}</registry>
|
||||||
</image>
|
</image>
|
||||||
</images>
|
</images>
|
||||||
<contextDir>${basedir}</contextDir>
|
<contextDir>${project.build.directory}/resources</contextDir>
|
||||||
<buildStrategy>docker</buildStrategy>
|
<buildStrategy>docker</buildStrategy>
|
||||||
<verbose>true</verbose>
|
<verbose>true</verbose>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user