Skip to content

Commit 9055777

Browse files
onobconobc
committed
Use spring-boot:build-image for all Docker images (remove Jib)
Partially resolves spring-cloud#156
1 parent 301ba87 commit 9055777

File tree

23 files changed

+141
-516
lines changed
  • .github/workflows
  • dataflow-website
    • batch-developer-guides/batch/batchsamples
    • stream-developer-guides
      • feature-guides/streams/function-composition
        • composed-http-transformer-kafka
        • composed-http-transformer-kotlin-kafka
        • composed-http-transformer-kotlin-rabbitmq
        • composed-http-transformer-rabbitmq
      • streams/standalone-stream-sample
  • function-samples/uppercase-processor
  • monitoring-samples/task-apps/task-demo-metrics-prometheus
  • multi-io-samples
    • kafka-streams/user-clicks-per-region-1.2.x
    • purchase-orders/http-purchase-orders
    • ticktock
  • scenario-task
  • timestamp-batch
  • timestamp-task

23 files changed

+141
-516
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- uses: ./.github/actions/build-sample-app
5252
with:
5353
app-dir: 'multi-io-samples/ticktock'
54-
mvn-build-commands: '-B clean install -Dmaven.javadoc.skip=true jib:dockerBuild -pl multi-output-time-rabbit,multi-input-log-rabbit,multi-output-time-kafka,multi-input-log-kafka'
54+
mvn-build-commands: '-B clean install -Dmaven.javadoc.skip=true spring-boot:build-image -pl multi-output-time-rabbit,multi-input-log-rabbit,multi-output-time-kafka,multi-input-log-kafka'
5555

5656
multi-io-http-purchase-orders:
5757
runs-on: ubuntu-latest
@@ -60,7 +60,7 @@ jobs:
6060
- uses: ./.github/actions/build-sample-app
6161
with:
6262
app-dir: 'multi-io-samples/purchase-orders/http-purchase-orders'
63-
mvn-build-commands: '-B clean install jib:dockerBuild'
63+
mvn-build-commands: '-B clean install spring-boot:build-image'
6464
docker-push: ${{ inputs.maven-build-only != true }}
6565
docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
6666
docker-password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -74,7 +74,7 @@ jobs:
7474
- uses: ./.github/actions/build-sample-app
7575
with:
7676
app-dir: 'multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x'
77-
mvn-build-commands: '-B clean install jib:dockerBuild -pl http-click-ingest,http-region-ingest,http-clicks-and-region-ingest,user-clicks-per-region-processor,log-user-clicks-per-region'
77+
mvn-build-commands: '-B clean install spring-boot:build-image -pl http-click-ingest,http-region-ingest,http-clicks-and-region-ingest,user-clicks-per-region-processor,log-user-clicks-per-region'
7878
artifactory-publish: ${{ inputs.maven-build-only != true }}
7979
jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }}
8080
docker-push: ${{ inputs.maven-build-only != true }}
@@ -105,7 +105,7 @@ jobs:
105105
- uses: ./.github/actions/build-sample-app
106106
with:
107107
app-dir: 'function-samples/uppercase-processor'
108-
mvn-build-commands: '-B clean install jib:dockerBuild'
108+
mvn-build-commands: '-B clean install spring-boot:build-image'
109109
artifactory-publish: ${{ inputs.maven-build-only != true }}
110110
jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }}
111111
docker-push: ${{ inputs.maven-build-only != true }}
@@ -121,7 +121,7 @@ jobs:
121121
- uses: ./.github/actions/build-sample-app
122122
with:
123123
app-dir: 'dataflow-website/stream-developer-guides/streams/standalone-stream-sample'
124-
mvn-build-commands: '-B clean install jib:dockerBuild'
124+
mvn-build-commands: '-B clean install spring-boot:build-image'
125125
artifactory-publish: ${{ inputs.maven-build-only != true }}
126126
jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }}
127127
docker-push: ${{ inputs.maven-build-only != true }}
@@ -139,7 +139,7 @@ jobs:
139139
- uses: ./.github/actions/build-sample-app
140140
with:
141141
app-dir: 'dataflow-website/stream-developer-guides/streams/standalone-stream-sample'
142-
mvn-build-commands: '-B clean install -Prabbit jib:dockerBuild'
142+
mvn-build-commands: '-B clean install -Prabbit spring-boot:build-image'
143143
artifactory-publish: ${{ inputs.maven-build-only != true }}
144144
jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }}
145145
jf-mvn-build-commands: '-B clean install -Prabbit -DskipTests'
@@ -158,7 +158,7 @@ jobs:
158158
- uses: ./.github/actions/build-sample-app
159159
with:
160160
app-dir: 'dataflow-website/batch-developer-guides/batch/batchsamples'
161-
mvn-build-commands: '-B clean install spring-boot:build-image -Dspring-boot.build-image.imageName=springcloudtask/billsetuptask:2.0.0-SNAPSHOT'
161+
mvn-build-commands: '-B clean install spring-boot:build-image'
162162
artifactory-publish: ${{ inputs.maven-build-only != true }}
163163
jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }}
164164
docker-push: ${{ inputs.maven-build-only != true }}
@@ -174,7 +174,7 @@ jobs:
174174
- uses: ./.github/actions/build-sample-app
175175
with:
176176
app-dir: 'dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka'
177-
mvn-build-commands: '-B clean install jib:dockerBuild'
177+
mvn-build-commands: '-B clean install spring-boot:build-image'
178178
artifactory-publish: ${{ inputs.maven-build-only != true }}
179179
jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }}
180180
docker-push: ${{ inputs.maven-build-only != true }}
@@ -190,7 +190,7 @@ jobs:
190190
- uses: ./.github/actions/build-sample-app
191191
with:
192192
app-dir: 'dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka'
193-
mvn-build-commands: '-B clean install jib:dockerBuild'
193+
mvn-build-commands: '-B clean install spring-boot:build-image'
194194
artifactory-publish: ${{ inputs.maven-build-only != true }}
195195
jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }}
196196
docker-push: ${{ inputs.maven-build-only != true }}
@@ -206,7 +206,7 @@ jobs:
206206
- uses: ./.github/actions/build-sample-app
207207
with:
208208
app-dir: 'dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq'
209-
mvn-build-commands: '-B clean install jib:dockerBuild'
209+
mvn-build-commands: '-B clean install spring-boot:build-image'
210210
artifactory-publish: ${{ inputs.maven-build-only != true }}
211211
jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }}
212212
docker-push: ${{ inputs.maven-build-only != true }}
@@ -222,7 +222,7 @@ jobs:
222222
- uses: ./.github/actions/build-sample-app
223223
with:
224224
app-dir: 'dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq'
225-
mvn-build-commands: '-B clean install jib:dockerBuild'
225+
mvn-build-commands: '-B clean install spring-boot:build-image'
226226
artifactory-publish: ${{ inputs.maven-build-only != true }}
227227
jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }}
228228
docker-push: ${{ inputs.maven-build-only != true }}
@@ -238,7 +238,7 @@ jobs:
238238
- uses: ./.github/actions/build-sample-app
239239
with:
240240
app-dir: 'monitoring-samples/task-apps/task-demo-metrics-prometheus'
241-
mvn-build-commands: '-B clean install docker:build'
241+
mvn-build-commands: '-B clean install spring-boot:build-image'
242242
artifactory-publish: ${{ inputs.maven-build-only != true }}
243243
jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }}
244244
docker-push: ${{ inputs.maven-build-only != true }}
@@ -254,7 +254,7 @@ jobs:
254254
- uses: ./.github/actions/build-sample-app
255255
with:
256256
app-dir: 'scenario-task'
257-
mvn-build-commands: '-B clean install spring-boot:build-image -Dspring-boot.build-image.imageName=springcloudtask/scenario-task:2.0.0-SNAPSHOT'
257+
mvn-build-commands: '-B clean install spring-boot:build-image'
258258
artifactory-publish: ${{ inputs.maven-build-only != true }}
259259
jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }}
260260
docker-push: ${{ inputs.maven-build-only != true }}
@@ -270,7 +270,7 @@ jobs:
270270
- uses: ./.github/actions/build-sample-app
271271
with:
272272
app-dir: 'timestamp-task'
273-
mvn-build-commands: '-B clean install spring-boot:build-image -Dspring-boot.build-image.imageName=springcloudtask/timestamp-task:2.0.0'
273+
mvn-build-commands: '-B clean install spring-boot:build-image'
274274
artifactory-publish: ${{ inputs.maven-build-only != true }}
275275
jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }}
276276
docker-push: ${{ inputs.maven-build-only != true }}
@@ -286,7 +286,7 @@ jobs:
286286
- uses: ./.github/actions/build-sample-app
287287
with:
288288
app-dir: 'timestamp-batch'
289-
mvn-build-commands: '-B clean install spring-boot:build-image -Dspring-boot.build-image.imageName=springcloudtask/timestamp-batch-task:2.0.0'
289+
mvn-build-commands: '-B clean install spring-boot:build-image'
290290
artifactory-publish: ${{ inputs.maven-build-only != true }}
291291
jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }}
292292
docker-push: ${{ inputs.maven-build-only != true }}

‎dataflow-website/batch-developer-guides/batch/batchsamples/pom.xml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
<java.version>1.8</java.version>
2525
<spring-cloud.version>2021.0.0</spring-cloud.version>
26-
<docker.org>springcloudtask</docker.org>
27-
<docker.version>${project.version}</docker.version>
2826
</properties>
2927

3028
<modules>
@@ -84,6 +82,11 @@
8482
<plugin>
8583
<groupId>org.springframework.boot</groupId>
8684
<artifactId>spring-boot-maven-plugin</artifactId>
85+
<configuration>
86+
<image>
87+
<name>springcloudtask/${project.artifactId}:${project.version}</name>
88+
</image>
89+
</configuration>
8790
</plugin>
8891
</plugins>
8992
</build>

‎dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/pom.xml‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
</snapshotRepository>
2727
</distributionManagement>
2828
<properties>
29-
<docker.org>springcloudstream</docker.org>
30-
<docker.version>${project.version}</docker.version>
3129
<skipTests>true</skipTests>
3230
<java.version>1.8</java.version>
3331
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -121,21 +119,10 @@
121119
<plugin>
122120
<groupId>org.springframework.boot</groupId>
123121
<artifactId>spring-boot-maven-plugin</artifactId>
124-
</plugin>
125-
<plugin>
126-
<groupId>com.google.cloud.tools</groupId>
127-
<artifactId>jib-maven-plugin</artifactId>
128-
<version>0.10.1</version>
129122
<configuration>
130-
<from>
131-
<image>springcloud/openjdk</image>
132-
</from>
133-
<to>
134-
<image>${docker.org}/${project.artifactId}:${docker.version}</image>
135-
</to>
136-
<container>
137-
<useCurrentTimestamp>true</useCurrentTimestamp>
138-
</container>
123+
<image>
124+
<name>springcloudstream/${project.artifactId}:${project.version}</name>
125+
</image>
139126
</configuration>
140127
</plugin>
141128
</plugins>

‎dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/pom.xml‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
</snapshotRepository>
2727
</distributionManagement>
2828
<properties>
29-
<docker.org>springcloudstream</docker.org>
30-
<docker.version>${project.version}</docker.version>
3129
<skipTests>true</skipTests>
3230
<java.version>1.8</java.version>
3331
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -131,21 +129,10 @@
131129
<plugin>
132130
<groupId>org.springframework.boot</groupId>
133131
<artifactId>spring-boot-maven-plugin</artifactId>
134-
</plugin>
135-
<plugin>
136-
<groupId>com.google.cloud.tools</groupId>
137-
<artifactId>jib-maven-plugin</artifactId>
138-
<version>0.10.1</version>
139132
<configuration>
140-
<from>
141-
<image>springcloud/openjdk</image>
142-
</from>
143-
<to>
144-
<image>${docker.org}/${project.artifactId}:${docker.version}</image>
145-
</to>
146-
<container>
147-
<useCurrentTimestamp>true</useCurrentTimestamp>
148-
</container>
133+
<image>
134+
<name>springcloudstream/${project.artifactId}:${project.version}</name>
135+
</image>
149136
</configuration>
150137
</plugin>
151138
<plugin>

‎dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/pom.xml‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
</snapshotRepository>
2727
</distributionManagement>
2828
<properties>
29-
<docker.org>springcloudstream</docker.org>
30-
<docker.version>${project.version}</docker.version>
3129
<skipTests>true</skipTests>
3230
<java.version>1.8</java.version>
3331
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -131,21 +129,10 @@
131129
<plugin>
132130
<groupId>org.springframework.boot</groupId>
133131
<artifactId>spring-boot-maven-plugin</artifactId>
134-
</plugin>
135-
<plugin>
136-
<groupId>com.google.cloud.tools</groupId>
137-
<artifactId>jib-maven-plugin</artifactId>
138-
<version>0.10.1</version>
139132
<configuration>
140-
<from>
141-
<image>springcloud/openjdk</image>
142-
</from>
143-
<to>
144-
<image>${docker.org}/${project.artifactId}:${docker.version}</image>
145-
</to>
146-
<container>
147-
<useCurrentTimestamp>true</useCurrentTimestamp>
148-
</container>
133+
<image>
134+
<name>springcloudstream/${project.artifactId}:${project.version}</name>
135+
</image>
149136
</configuration>
150137
</plugin>
151138
<plugin>

‎dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/pom.xml‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
</snapshotRepository>
2727
</distributionManagement>
2828
<properties>
29-
<docker.org>springcloudstream</docker.org>
30-
<docker.version>${project.version}</docker.version>
3129
<skipTests>true</skipTests>
3230
<java.version>1.8</java.version>
3331
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -121,21 +119,10 @@
121119
<plugin>
122120
<groupId>org.springframework.boot</groupId>
123121
<artifactId>spring-boot-maven-plugin</artifactId>
124-
</plugin>
125-
<plugin>
126-
<groupId>com.google.cloud.tools</groupId>
127-
<artifactId>jib-maven-plugin</artifactId>
128-
<version>0.10.1</version>
129122
<configuration>
130-
<from>
131-
<image>springcloud/openjdk</image>
132-
</from>
133-
<to>
134-
<image>${docker.org}/${project.artifactId}:${docker.version}</image>
135-
</to>
136-
<container>
137-
<useCurrentTimestamp>true</useCurrentTimestamp>
138-
</container>
123+
<image>
124+
<name>springcloudstream/${project.artifactId}:${project.version}</name>
125+
</image>
139126
</configuration>
140127
</plugin>
141128
</plugins>

‎dataflow-website/stream-developer-guides/streams/standalone-stream-sample/pom.xml‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
<module>usage-detail-sender</module>
2020
</modules>
2121
<properties>
22-
<docker.org>springcloudstream</docker.org>
23-
<docker.version>${project.version}</docker.version>
2422
<java.version>1.8</java.version>
2523
<spring-cloud.version>2021.0.0</spring-cloud.version>
2624
</properties>
@@ -42,21 +40,10 @@
4240
<plugin>
4341
<groupId>org.springframework.boot</groupId>
4442
<artifactId>spring-boot-maven-plugin</artifactId>
45-
</plugin>
46-
<plugin>
47-
<groupId>com.google.cloud.tools</groupId>
48-
<artifactId>jib-maven-plugin</artifactId>
49-
<version>2.0.0</version>
5043
<configuration>
51-
<from>
52-
<image>springcloud/openjdk</image>
53-
</from>
54-
<to>
55-
<image>${docker.org}/${project.artifactId}:${docker.version}</image>
56-
</to>
57-
<container>
58-
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
59-
</container>
44+
<image>
45+
<name>springcloudstream/multi-io-sample-${project.artifactId}:${project.version}</name>
46+
</image>
6047
</configuration>
6148
</plugin>
6249
</plugins>

‎function-samples/uppercase-processor/pom.xml‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -125,25 +125,12 @@
125125
<plugin>
126126
<groupId>org.springframework.boot</groupId>
127127
<artifactId>spring-boot-maven-plugin</artifactId>
128-
</plugin>
129-
<plugin>
130-
<groupId>com.google.cloud.tools</groupId>
131-
<artifactId>jib-maven-plugin</artifactId>
132-
<version>2.0.0</version>
133128
<configuration>
134-
<from>
135-
<image>springcloud/openjdk</image>
136-
</from>
137-
<to>
138-
<image>springcloudstream/${project.artifactId}</image>
139-
<tags>
140-
<tag>1.0.0-SNAPSHOT</tag>
141-
</tags>
142-
</to>
129+
<image>
130+
<name>springcloudstream/${project.artifactId}:${project.version}</name>
131+
</image>
143132
</configuration>
144133
</plugin>
145-
146-
147134
</plugins>
148135
</build>
149136

0 commit comments

Comments
 (0)