Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

Commit 1c37f2a

Browse files
jvalkealjvalkeal
committed
Update milestone/release workflow workers
- Use composite action for images - Relates #4697
1 parent 3ae687c commit 1c37f2a

File tree

2 files changed

+12
-242
lines changed

2 files changed

+12
-242
lines changed

‎.github/workflows/milestone-worker.yml‎

Lines changed: 6 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -153,128 +153,13 @@ jobs:
153153
tag-release-tag: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}
154154
tag-release-tag-prefix: v
155155

156-
# build images to local repo to get pushed
157-
- name: Build Images
158-
env:
159-
TAG: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}
160-
run: |
161-
pack build \
162-
--path spring-cloud-dataflow-server/target/spring-cloud-dataflow-server-$TAG.jar \
163-
--builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
164-
--env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-server:$TAG-jdk8
165-
pack build \
166-
--path spring-cloud-dataflow-server/target/spring-cloud-dataflow-server-$TAG.jar \
167-
--builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
168-
--env BP_JVM_VERSION=11 springcloud/spring-cloud-dataflow-server:$TAG-jdk11
169-
pack build \
170-
--path spring-cloud-dataflow-server/target/spring-cloud-dataflow-server-$TAG.jar \
171-
--builder gcr.io/paketo-buildpacks/builder:base \
172-
--env BP_JVM_VERSION=16 springcloud/spring-cloud-dataflow-server:$TAG-jdk16
173-
pack build \
174-
--path spring-cloud-dataflow-composed-task-runner/target/spring-cloud-dataflow-composed-task-runner-$TAG.jar \
175-
--builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
176-
--env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk8
177-
pack build \
178-
--path spring-cloud-dataflow-composed-task-runner/target/spring-cloud-dataflow-composed-task-runner-$TAG.jar \
179-
--builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
180-
--env BP_JVM_VERSION=11 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk11
181-
pack build \
182-
--path spring-cloud-dataflow-composed-task-runner/target/spring-cloud-dataflow-composed-task-runner-$TAG.jar \
183-
--builder gcr.io/paketo-buildpacks/builder:base \
184-
--env BP_JVM_VERSION=16 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk16
185-
pack build \
186-
--path spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-kafka/target/spring-cloud-dataflow-tasklauncher-sink-kafka-$TAG.jar \
187-
--builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
188-
--env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:$TAG-jdk8
189-
pack build \
190-
--path spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-rabbit/target/spring-cloud-dataflow-tasklauncher-sink-rabbit-$TAG.jar \
191-
--builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
192-
--env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-tasklauncher-sink-rabbit:$TAG-jdk8
193-
pack build \
194-
--path spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-kafka/target/spring-cloud-dataflow-tasklauncher-sink-kafka-$TAG.jar \
195-
--builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
196-
--env BP_JVM_VERSION=11 springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:$TAG-jdk11
197-
pack build \
198-
--path spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-rabbit/target/spring-cloud-dataflow-tasklauncher-sink-rabbit-$TAG.jar \
199-
--builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
200-
--env BP_JVM_VERSION=11 springcloud/spring-cloud-dataflow-tasklauncher-sink-rabbit:$TAG-jdk11
201-
pack build \
202-
--path spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-kafka/target/spring-cloud-dataflow-tasklauncher-sink-kafka-$TAG.jar \
203-
--builder gcr.io/paketo-buildpacks/builder:base \
204-
--env BP_JVM_VERSION=16 springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:$TAG-jdk16
205-
pack build \
206-
--path spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-rabbit/target/spring-cloud-dataflow-tasklauncher-sink-rabbit-$TAG.jar \
207-
--builder gcr.io/paketo-buildpacks/builder:base \
208-
--env BP_JVM_VERSION=16 springcloud/spring-cloud-dataflow-tasklauncher-sink-rabbit:$TAG-jdk16
209-
pack build \
210-
--path spring-cloud-dataflow-single-step-batch-job/target/spring-cloud-dataflow-single-step-batch-job-$TAG.jar \
211-
--builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
212-
--env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-single-step-batch-job:$TAG-jdk8
213-
pack build \
214-
--path spring-cloud-dataflow-single-step-batch-job/target/spring-cloud-dataflow-single-step-batch-job-$TAG.jar \
215-
--builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
216-
--env BP_JVM_VERSION=11 springcloud/spring-cloud-dataflow-single-step-batch-job:$TAG-jdk11
217-
pack build \
218-
--path spring-cloud-dataflow-single-step-batch-job/target/spring-cloud-dataflow-single-step-batch-job-$TAG.jar \
219-
--builder gcr.io/paketo-buildpacks/builder:base \
220-
--env BP_JVM_VERSION=16 springcloud/spring-cloud-dataflow-single-step-batch-job:$TAG-jdk16
221-
222-
# docker hub login
223-
- uses: docker/login-action@v1
224-
with:
225-
username: ${{ secrets.DOCKERHUB_USERNAME }}
226-
password: ${{ secrets.DOCKERHUB_TOKEN }}
227-
228-
# push images
229-
- name: Push image
230-
env:
231-
TAG: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}
232-
run: |
233-
docker push springcloud/spring-cloud-dataflow-server:$TAG-jdk8
234-
docker push springcloud/spring-cloud-dataflow-server:$TAG-jdk11
235-
docker push springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk8
236-
docker push springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk11
237-
docker tag springcloud/spring-cloud-dataflow-server:$TAG-jdk11 springcloud/spring-cloud-dataflow-server:$TAG
238-
docker tag springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk11 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG
239-
docker push springcloud/spring-cloud-dataflow-server:$TAG
240-
docker push springcloud/spring-cloud-dataflow-composed-task-runner:$TAG
241-
docker push springcloud/spring-cloud-dataflow-server:$TAG-jdk16
242-
docker push springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk16
243-
docker push springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:$TAG-jdk8
244-
docker push springcloud/spring-cloud-dataflow-tasklauncher-sink-rabbit:$TAG-jdk8
245-
docker push springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:$TAG-jdk11
246-
docker push springcloud/spring-cloud-dataflow-tasklauncher-sink-rabbit:$TAG-jdk11
247-
docker push springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:$TAG-jdk16
248-
docker push springcloud/spring-cloud-dataflow-tasklauncher-sink-rabbit:$TAG-jdk16
249-
docker tag springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:$TAG-jdk11 springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:$TAG
250-
docker tag springcloud/spring-cloud-dataflow-tasklauncher-sink-rabbit:$TAG-jdk11 springcloud/spring-cloud-dataflow-tasklauncher-sink-rabbit:$TAG
251-
docker push springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:$TAG
252-
docker push springcloud/spring-cloud-dataflow-tasklauncher-sink-rabbit:$TAG
253-
docker push springcloud/spring-cloud-dataflow-single-step-batch-job:$TAG-jdk8
254-
docker push springcloud/spring-cloud-dataflow-single-step-batch-job:$TAG-jdk11
255-
docker tag springcloud/spring-cloud-dataflow-single-step-batch-job:$TAG-jdk11 springcloud/spring-cloud-dataflow-single-step-batch-job:$TAG
256-
docker push springcloud/spring-cloud-dataflow-single-step-batch-job:$TAG
257-
docker push springcloud/spring-cloud-dataflow-single-step-batch-job:$TAG-jdk16
258-
259-
# build/publish support images
260-
- name: Publish Grafana Prometheus
261-
uses: docker/build-push-action@v2
262-
with:
263-
context: src/grafana/prometheus/docker/grafana
264-
push: true
265-
tags: springcloud/spring-cloud-dataflow-grafana-prometheus:${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}
266-
- name: Publish Grafana InfluxDB
267-
uses: docker/build-push-action@v2
268-
with:
269-
context: src/grafana/influxdb/docker/grafana
270-
push: true
271-
tags: springcloud/spring-cloud-dataflow-grafana-influxdb:${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}
272-
- name: Publish Prometheus Local
273-
uses: docker/build-push-action@v2
156+
# build and publish images via composite action
157+
- name: Build and Publish Images
158+
uses: ./.github/actions/build-images
274159
with:
275-
context: src/grafana/prometheus/docker/prometheus-local
276-
push: true
277-
tags: springcloud/spring-cloud-dataflow-prometheus-local:${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}
160+
version: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}
161+
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
162+
dockerhub-password: ${{ secrets.DOCKERHUB_TOKEN }}
278163

279164
# zoo success
280165
- name: Notify Build Success Zoo Handler Controller

‎.github/workflows/release-worker.yml‎

Lines changed: 6 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -152,128 +152,13 @@ jobs:
152152
tag-release-tag: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}
153153
tag-release-tag-prefix: v
154154

155-
# build images to local repo to get pushed
156-
- name: Build Images
157-
env:
158-
TAG: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}
159-
run: |
160-
pack build \
161-
--path spring-cloud-dataflow-server/target/spring-cloud-dataflow-server-$TAG.jar \
162-
--builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
163-
--env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-server:$TAG-jdk8
164-
pack build \
165-
--path spring-cloud-dataflow-server/target/spring-cloud-dataflow-server-$TAG.jar \
166-
--builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
167-
--env BP_JVM_VERSION=11 springcloud/spring-cloud-dataflow-server:$TAG-jdk11
168-
pack build \
169-
--path spring-cloud-dataflow-server/target/spring-cloud-dataflow-server-$TAG.jar \
170-
--builder gcr.io/paketo-buildpacks/builder:base \
171-
--env BP_JVM_VERSION=16 springcloud/spring-cloud-dataflow-server:$TAG-jdk16
172-
pack build \
173-
--path spring-cloud-dataflow-composed-task-runner/target/spring-cloud-dataflow-composed-task-runner-$TAG.jar \
174-
--builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
175-
--env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk8
176-
pack build \
177-
--path spring-cloud-dataflow-composed-task-runner/target/spring-cloud-dataflow-composed-task-runner-$TAG.jar \
178-
--builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
179-
--env BP_JVM_VERSION=11 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk11
180-
pack build \
181-
--path spring-cloud-dataflow-composed-task-runner/target/spring-cloud-dataflow-composed-task-runner-$TAG.jar \
182-
--builder gcr.io/paketo-buildpacks/builder:base \
183-
--env BP_JVM_VERSION=16 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk16
184-
pack build \
185-
--path spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-kafka/target/spring-cloud-dataflow-tasklauncher-sink-kafka-$TAG.jar \
186-
--builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
187-
--env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:$TAG-jdk8
188-
pack build \
189-
--path spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-rabbit/target/spring-cloud-dataflow-tasklauncher-sink-rabbit-$TAG.jar \
190-
--builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
191-
--env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-tasklauncher-sink-rabbit:$TAG-jdk8
192-
pack build \
193-
--path spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-kafka/target/spring-cloud-dataflow-tasklauncher-sink-kafka-$TAG.jar \
194-
--builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
195-
--env BP_JVM_VERSION=11 springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:$TAG-jdk11
196-
pack build \
197-
--path spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-rabbit/target/spring-cloud-dataflow-tasklauncher-sink-rabbit-$TAG.jar \
198-
--builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
199-
--env BP_JVM_VERSION=11 springcloud/spring-cloud-dataflow-tasklauncher-sink-rabbit:$TAG-jdk11
200-
pack build \
201-
--path spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-kafka/target/spring-cloud-dataflow-tasklauncher-sink-kafka-$TAG.jar \
202-
--builder gcr.io/paketo-buildpacks/builder:base \
203-
--env BP_JVM_VERSION=16 springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:$TAG-jdk16
204-
pack build \
205-
--path spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-rabbit/target/spring-cloud-dataflow-tasklauncher-sink-rabbit-$TAG.jar \
206-
--builder gcr.io/paketo-buildpacks/builder:base \
207-
--env BP_JVM_VERSION=16 springcloud/spring-cloud-dataflow-tasklauncher-sink-rabbit:$TAG-jdk16
208-
pack build \
209-
--path spring-cloud-dataflow-single-step-batch-job/target/spring-cloud-dataflow-single-step-batch-job-$TAG.jar \
210-
--builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
211-
--env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-single-step-batch-job:$TAG-jdk8
212-
pack build \
213-
--path spring-cloud-dataflow-single-step-batch-job/target/spring-cloud-dataflow-single-step-batch-job-$TAG.jar \
214-
--builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
215-
--env BP_JVM_VERSION=11 springcloud/spring-cloud-dataflow-single-step-batch-job:$TAG-jdk11
216-
pack build \
217-
--path spring-cloud-dataflow-single-step-batch-job/target/spring-cloud-dataflow-single-step-batch-job-$TAG.jar \
218-
--builder gcr.io/paketo-buildpacks/builder:base \
219-
--env BP_JVM_VERSION=16 springcloud/spring-cloud-dataflow-single-step-batch-job:$TAG-jdk16
220-
221-
# docker hub login
222-
- uses: docker/login-action@v1
223-
with:
224-
username: ${{ secrets.DOCKERHUB_USERNAME }}
225-
password: ${{ secrets.DOCKERHUB_TOKEN }}
226-
227-
# push images
228-
- name: Push image
229-
env:
230-
TAG: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}
231-
run: |
232-
docker push springcloud/spring-cloud-dataflow-server:$TAG-jdk8
233-
docker push springcloud/spring-cloud-dataflow-server:$TAG-jdk11
234-
docker push springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk8
235-
docker push springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk11
236-
docker tag springcloud/spring-cloud-dataflow-server:$TAG-jdk11 springcloud/spring-cloud-dataflow-server:$TAG
237-
docker tag springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk11 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG
238-
docker push springcloud/spring-cloud-dataflow-server:$TAG
239-
docker push springcloud/spring-cloud-dataflow-composed-task-runner:$TAG
240-
docker push springcloud/spring-cloud-dataflow-server:$TAG-jdk16
241-
docker push springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk16
242-
docker push springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:$TAG-jdk8
243-
docker push springcloud/spring-cloud-dataflow-tasklauncher-sink-rabbit:$TAG-jdk8
244-
docker push springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:$TAG-jdk11
245-
docker push springcloud/spring-cloud-dataflow-tasklauncher-sink-rabbit:$TAG-jdk11
246-
docker push springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:$TAG-jdk16
247-
docker push springcloud/spring-cloud-dataflow-tasklauncher-sink-rabbit:$TAG-jdk16
248-
docker tag springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:$TAG-jdk11 springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:$TAG
249-
docker tag springcloud/spring-cloud-dataflow-tasklauncher-sink-rabbit:$TAG-jdk11 springcloud/spring-cloud-dataflow-tasklauncher-sink-rabbit:$TAG
250-
docker push springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:$TAG
251-
docker push springcloud/spring-cloud-dataflow-tasklauncher-sink-rabbit:$TAG
252-
docker push springcloud/spring-cloud-dataflow-single-step-batch-job:$TAG-jdk8
253-
docker push springcloud/spring-cloud-dataflow-single-step-batch-job:$TAG-jdk11
254-
docker tag springcloud/spring-cloud-dataflow-single-step-batch-job:$TAG-jdk11 springcloud/spring-cloud-dataflow-single-step-batch-job:$TAG
255-
docker push springcloud/spring-cloud-dataflow-single-step-batch-job:$TAG
256-
docker push springcloud/spring-cloud-dataflow-single-step-batch-job:$TAG-jdk16
257-
258-
# build/publish support images
259-
- name: Publish Grafana Prometheus
260-
uses: docker/build-push-action@v2
261-
with:
262-
context: src/grafana/prometheus/docker/grafana
263-
push: true
264-
tags: springcloud/spring-cloud-dataflow-grafana-prometheus:${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}
265-
- name: Publish Grafana InfluxDB
266-
uses: docker/build-push-action@v2
267-
with:
268-
context: src/grafana/influxdb/docker/grafana
269-
push: true
270-
tags: springcloud/spring-cloud-dataflow-grafana-influxdb:${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}
271-
- name: Publish Prometheus Local
272-
uses: docker/build-push-action@v2
155+
# build and publish images via composite action
156+
- name: Build and Publish Images
157+
uses: ./.github/actions/build-images
273158
with:
274-
context: src/grafana/prometheus/docker/prometheus-local
275-
push: true
276-
tags: springcloud/spring-cloud-dataflow-prometheus-local:${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}
159+
version: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}
160+
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
161+
dockerhub-password: ${{ secrets.DOCKERHUB_TOKEN }}
277162

278163
# zoo success
279164
- name: Notify Build Success Zoo Handler Controller

0 commit comments

Comments
 (0)