SpringCloud/spring-cloud-dataflow-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use spring-boot:build-image for all Docker images (remove Jib) (#166)

Browse Source 
Partially resolves #156
This commit is contained in:
Chris Bono
2022-01-24 14:10:29 -06:00
committed by GitHub
parent 301ba872bb
commit 1e7eea200c
23 changed files with 141 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
monitoring-samples/task-apps/task-demo-metrics-prometheus/pom.xml
View File

@@ -120,58 +120,15 @@
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0.0</version>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>read-project-properties</goal>
</goals>
<configuration>
<files>
<file>${project.build.outputDirectory}/META-INF/spring-configuration-metadata-encoded.properties</file>
</files>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.33.0</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<images>
<image>
<name>springcloudtask/${project.artifactId}</name>
<build>
<tags>
<tag>latest</tag>
<tag>${project.version}</tag>
</tags>
<from>springcloud/baseimage:1.0.0</from>
<volumes>
<volume>/tmp</volume>
</volumes>
<labels>
<org.springframework.cloud.dataflow.spring-configuration-metadata.json>
${org.springframework.cloud.dataflow.spring.configuration.metadata.json}
</org.springframework.cloud.dataflow.spring-configuration-metadata.json>
</labels>
<entryPoint>
<exec>
<arg>java</arg>
<arg>-jar</arg>
<arg>/maven/task-demo-metrics-prometheus.jar</arg>
</exec>
</entryPoint>
<assembly>
<descriptor>assembly.xml</descriptor>
</assembly>
</build>
</image>
</images>
<image>
<name>springcloudtask/${project.artifactId}:${project.version}</name>
<bindings>
<binding>/tmp:/tmp</binding>
</bindings>
</image>
</configuration>
</plugin>
</plugins>

15
monitoring-samples/task-apps/task-demo-metrics-prometheus/src/main/docker/assembly.xml
View File

@@ -1,15 +0,0 @@
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>task-demo-metrics-prometheus</id>
<dependencySets>
<dependencySet>
<includes>
<include>io.spring.task:task-demo-metrics-prometheus</include>
</includes>
<outputDirectory>.</outputDirectory>
<outputFileNameMapping>task-demo-metrics-prometheus.jar</outputFileNameMapping>
</dependencySet>
</dependencySets>
</assembly>