Skip to content

Commit 6d13246

Browse files
committed
Merge branch 'release-0.6'
2 parents 6d778b7 + 2f51b35 commit 6d13246

File tree

1 file changed

+9
-25
lines changed

1 file changed

+9
-25
lines changed

.github/workflows/build_test_push.yaml

+9-25
Original file line numberDiff line numberDiff line change
@@ -223,23 +223,14 @@ jobs:
223223
--build-arg RONDB_TARBALL_LOCAL_REMOTE=remote \
224224
--build-arg RONDB_X86_TARBALL_URI=${{ inputs.base_download_url }}/${{ inputs.rondb_x86_tarball_name }}
225225
226-
- name: Push standard versioned image
226+
- name: Push versioned image
227227
if: github.repository == 'logicalclocks/rondb-docker' && (startsWith(github.ref_name, 'release-') || github.ref_name == 'main')
228228
run: |
229229
NEW_IMAGE_ID=hopsworks/$X86_IMAGE_ID
230230
231231
docker tag $X86_IMAGE_ID $NEW_IMAGE_ID
232232
docker push $NEW_IMAGE_ID
233233
234-
- name: Push with tag `<rondb-version>-latest`
235-
# Our "latest" branch points to the latest *release* branch.
236-
if: needs.process-info.outputs.is_highest_release == 'true'
237-
run: |
238-
NEW_IMAGE_ID=hopsworks/$X86_IMAGE_NAME:${{ inputs.rondb_version }}-latest
239-
240-
docker tag $X86_IMAGE_ID $NEW_IMAGE_ID
241-
docker push $NEW_IMAGE_ID
242-
243234
- name: Push with tag `latest`
244235
if: ${{ needs.process-info.outputs.is_highest_release == 'true' && inputs.is_latest_rondb_release }}
245236
run: |
@@ -276,11 +267,9 @@ jobs:
276267
ARM_IMAGE_NAME="${{ needs.process-info.outputs.arm_image_name }}"
277268
278269
TAGS="--tag hopsworks/$ARM_IMAGE_NAME:${{ inputs.rondb_version }}-$VERSION"
279-
if [[ "${{ needs.process-info.outputs.is_highest_release }}" == "true" ]]; then
280-
TAGS+=" --tag hopsworks/$ARM_IMAGE_NAME:${{ inputs.rondb_version }}-latest"
281-
if [[ "${{ inputs.is_latest_rondb_release }}" == "true" ]]; then
282-
TAGS+=" --tag hopsworks/$ARM_IMAGE_NAME:latest"
283-
fi
270+
if [[ "${{ needs.process-info.outputs.is_highest_release }}" == "true" &&
271+
"${{ inputs.is_latest_rondb_release }}" == "true" ]]; then
272+
TAGS+=" --tag hopsworks/$ARM_IMAGE_NAME:latest"
284273
fi
285274
286275
docker buildx build . \
@@ -332,16 +321,11 @@ jobs:
332321
hopsworks/$X86_IMAGE_NAME:${{ inputs.rondb_version }}-$VERSION \
333322
hopsworks/$ARM_IMAGE_NAME:${{ inputs.rondb_version }}-$VERSION
334323
335-
if [[ "${{ needs.process-info.outputs.is_highest_release }}" == "true" ]]; then
336-
docker buildx imagetools create -t $repo_url/hopsworks/$MULTI_IMAGE_NAME:${{ inputs.rondb_version }}-latest \
337-
hopsworks/$X86_IMAGE_NAME:${{ inputs.rondb_version }}-latest \
338-
hopsworks/$ARM_IMAGE_NAME:${{ inputs.rondb_version }}-latest
339-
340-
if [[ "${{ inputs.is_latest_rondb_release }}" == "true" ]]; then
341-
docker buildx imagetools create -t $repo_url/hopsworks/$MULTI_IMAGE_NAME:latest \
342-
hopsworks/$X86_IMAGE_NAME:latest \
343-
hopsworks/$ARM_IMAGE_NAME:latest
344-
fi
324+
if [[ "${{ needs.process-info.outputs.is_highest_release }}" == "true" &&
325+
"${{ inputs.is_latest_rondb_release }}" == "true" ]]; then
326+
docker buildx imagetools create -t $repo_url/hopsworks/$MULTI_IMAGE_NAME:latest \
327+
hopsworks/$X86_IMAGE_NAME:latest \
328+
hopsworks/$ARM_IMAGE_NAME:latest
345329
fi
346330
347331
done

0 commit comments

Comments
 (0)