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

32
multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-click-ingest/pom.xml
View File

@@ -130,31 +130,15 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>springcloudstream/multi-io-sample-${project.artifactId}</image>
<tags>
<tag>1.2.0-SNAPSHOT</tag>
</tags>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
<format>Docker</format>
<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>
<configuration-properties.outbound-ports>${configuration-properties.outbound-ports}</configuration-properties.outbound-ports>
</labels>
</container>
<image>
<name>springcloudstream/multi-io-sample-${project.artifactId}:${project.version}</name>
<env>
<BP_IMAGE_LABELS>
configuration-properties.outbound-ports="${configuration-properties.outbound-ports}"
</BP_IMAGE_LABELS>
</env>
</image>
</configuration>
</plugin>
<plugin>

29
multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-clicks-and-region-ingest/pom.xml
View File

@@ -132,28 +132,15 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>springcloudstream/multi-io-sample-${project.artifactId}</image>
<tags>
<tag>1.2.0-SNAPSHOT</tag>
</tags>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
<format>Docker</format>
<labels>
<configuration-properties.outbound-ports>${configuration-properties.outbound-ports}</configuration-properties.outbound-ports>
</labels>
</container>
<image>
<name>springcloudstream/multi-io-sample-${project.artifactId}:${project.version}</name>
<env>
<BP_IMAGE_LABELS>
configuration-properties.outbound-ports="${configuration-properties.outbound-ports}"
</BP_IMAGE_LABELS>
</env>
</image>
</configuration>
</plugin>
<plugin>

32
multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-region-ingest/pom.xml
View File

@@ -136,31 +136,15 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>springcloudstream/multi-io-sample-${project.artifactId}</image>
<tags>
<tag>1.2.0-SNAPSHOT</tag>
</tags>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
<format>Docker</format>
<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>
<configuration-properties.outbound-ports>${configuration-properties.outbound-ports}</configuration-properties.outbound-ports>
</labels>
</container>
<image>
<name>springcloudstream/multi-io-sample-${project.artifactId}:${project.version}</name>
<env>
<BP_IMAGE_LABELS>
configuration-properties.outbound-ports="${configuration-properties.outbound-ports}"
</BP_IMAGE_LABELS>
</env>
</image>
</configuration>
</plugin>
<plugin>

29
multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/log-user-clicks-per-region/pom.xml
View File

@@ -123,28 +123,15 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>springcloudstream/multi-io-sample-${project.artifactId}</image>
<tags>
<tag>1.2.0-SNAPSHOT</tag>
</tags>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
<format>Docker</format>
<labels>
<configuration-properties.inbound-ports>input</configuration-properties.inbound-ports>
</labels>
</container>
<image>
<name>springcloudstream/multi-io-sample-${project.artifactId}:${project.version}</name>
<env>
<BP_IMAGE_LABELS>
configuration-properties.inbound-ports=input
</BP_IMAGE_LABELS>
</env>
</image>
</configuration>
</plugin>
<plugin>

30
multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/user-clicks-per-region-processor/pom.xml
View File

@@ -129,29 +129,15 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>springcloudstream/multi-io-sample-${project.artifactId}</image>
<tags>
<tag>1.2.0-SNAPSHOT</tag>
</tags>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
<format>Docker</format>
<labels>
<configuration-properties.inbound-ports>${configuration-properties.inbound-ports}</configuration-properties.inbound-ports>
<configuration-properties.outbound-ports>${configuration-properties.outbound-ports}</configuration-properties.outbound-ports>
</labels>
</container>
<image>
<name>springcloudstream/multi-io-sample-${project.artifactId}:${project.version}</name>
<env>
<BP_IMAGE_LABELS>
configuration-properties.inbound-ports="${configuration-properties.inbound-ports}",configuration-properties.outbound-ports="${configuration-properties.outbound-ports}"
</BP_IMAGE_LABELS>
</env>
</image>
</configuration>
</plugin>
<plugin>

29
multi-io-samples/purchase-orders/http-purchase-orders/pom.xml
View File

@@ -113,28 +113,15 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>springcloudstream/multi-io-sample-${project.artifactId}</image>
<tags>
<tag>1.0.0-SNAPSHOT</tag>
</tags>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
<format>Docker</format>
<labels>
<configuration-properties.outbound-ports>${configuration-properties.outbound-ports}</configuration-properties.outbound-ports>
</labels>
</container>
<image>
<name>springcloudstream/multi-io-sample-${project.artifactId}:${project.version}</name>
<env>
<BP_IMAGE_LABELS>
configuration-properties.outbound-ports="${configuration-properties.outbound-ports}"
</BP_IMAGE_LABELS>
</env>
</image>
</configuration>
</plugin>
<plugin>

59
multi-io-samples/ticktock/multi-input-log-kafka/pom.xml
View File

@@ -190,60 +190,17 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>springcloudstream/multi-io-sample-${project.artifactId}</image>
<tags>
<tag>1.0.0-SNAPSHOT</tag>
</tags>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
<format>Docker</format>
<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>
<configuration-properties.inbound-ports>input1,input2,input3</configuration-properties.inbound-ports>
</labels>
</container>
<image>
<name>springcloudstream/multi-io-sample-${project.artifactId}:${project.version}</name>
<env>
<BP_IMAGE_LABELS>
configuration-properties.inbound-ports="input1,input2,input3"
</BP_IMAGE_LABELS>
</env>
</image>
</configuration>
</plugin>
<!--
Use of properties-maven-plugin to load the encoded metadata properties created by the jib-maven-plugin
Use: Use: ./mvnw clean install jib:dockerBuild or ./mvnw clean install jib:build
-->
<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>org.springframework.cloud</groupId>
<artifactId>spring-cloud-app-starter-metadata-maven-plugin</artifactId>

59
multi-io-samples/ticktock/multi-input-log-rabbit/pom.xml
View File

@@ -190,60 +190,17 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>springcloudstream/multi-io-sample-${project.artifactId}</image>
<tags>
<tag>1.0.0-SNAPSHOT</tag>
</tags>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
<format>Docker</format>
<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>
<configuration-properties.inbound-ports>input1,input2,input3</configuration-properties.inbound-ports>
</labels>
</container>
<image>
<name>springcloudstream/multi-io-sample-${project.artifactId}:${project.version}</name>
<env>
<BP_IMAGE_LABELS>
configuration-properties.inbound-ports="input1,input2,input3"
</BP_IMAGE_LABELS>
</env>
</image>
</configuration>
</plugin>
<!--
Use of properties-maven-plugin to load the encoded metadata properties created by the jib-maven-plugin
Use: Use: ./mvnw clean install jib:dockerBuild or ./mvnw clean install jib:build
-->
<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>org.springframework.cloud</groupId>
<artifactId>spring-cloud-app-starter-metadata-maven-plugin</artifactId>

59
multi-io-samples/ticktock/multi-output-time-kafka/pom.xml
View File

@@ -195,60 +195,17 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>springcloudstream/multi-io-sample-${project.artifactId}</image>
<tags>
<tag>1.0.0-SNAPSHOT</tag>
</tags>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
<format>Docker</format>
<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>
<configuration-properties.outbound-ports>output1,output2,output3</configuration-properties.outbound-ports>
</labels>
</container>
<image>
<name>springcloudstream/multi-io-sample-${project.artifactId}:${project.version}</name>
<env>
<BP_IMAGE_LABELS>
configuration-properties.outbound-ports="output1,output2,output3"
</BP_IMAGE_LABELS>
</env>
</image>
</configuration>
</plugin>
<!--
Use of properties-maven-plugin to load the encoded metadata properties created by the jib-maven-plugin
Use: Use: ./mvnw clean install jib:dockerBuild or ./mvnw clean install jib:build
-->
<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>org.springframework.cloud</groupId>
<artifactId>spring-cloud-app-starter-metadata-maven-plugin</artifactId>

59
multi-io-samples/ticktock/multi-output-time-rabbit/pom.xml
View File

@@ -195,60 +195,17 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>springcloudstream/multi-io-sample-${project.artifactId}</image>
<tags>
<tag>1.0.0-SNAPSHOT</tag>
</tags>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
<format>Docker</format>
<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>
<configuration-properties.outbound-ports>output1,output2,output3</configuration-properties.outbound-ports>
</labels>
</container>
<image>
<name>springcloudstream/multi-io-sample-${project.artifactId}:${project.version}</name>
<env>
<BP_IMAGE_LABELS>
configuration-properties.outbound-ports="output1,output2,output3"
</BP_IMAGE_LABELS>
</env>
</image>
</configuration>
</plugin>
<!--
Use of properties-maven-plugin to load the encoded metadata properties created by the jib-maven-plugin
Use: Use: ./mvnw clean install jib:dockerBuild or ./mvnw clean install jib:build
-->
<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>org.springframework.cloud</groupId>
<artifactId>spring-cloud-app-starter-metadata-maven-plugin</artifactId>