Skip to content

Commit

Permalink
Removed UBI 7 container
Browse files Browse the repository at this point in the history
  • Loading branch information
bradfordcp committed Apr 12, 2024
1 parent 4799ca8 commit 098f8a3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 21 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ RUN microdnf update && rm -rf /var/cache/yum && \
#############################################################

# Build the UBI8 image
FROM redhat/ubi8-minimal:8.9 as cass-config-builder-ubi-8
FROM redhat/ubi8-minimal:8.9 as cass-config-builder-ubi
LABEL maintainer="DataStax, Inc <[email protected]>"
LABEL name="cass-config-builder"
LABEL vendor="DataStax, Inc"
Expand Down
22 changes: 2 additions & 20 deletions scripts/build-push-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ RELEASE_VERSION="${VERSION_NUMBER}-${VERSION_DATE}"
GH_REPOSITORY="ghcr.io/${GITHUB_REPO_OWNER}/cass-config-builder/cass-config-builder"

GH_TAGS=(--tag "${GH_REPOSITORY}:${RELEASE_VERSION}")
GH_UBI_TAGS=(--tag "${GH_REPOSITORY}:${RELEASE_VERSION}-ubi7")
GH_UBI8_TAGS=(--tag "${GH_REPOSITORY}:${RELEASE_VERSION}-ubi8")
GH_UBI_TAGS=(--tag "${GH_REPOSITORY}:${RELEASE_VERSION}-ubi")
GH_ARM64_TAGS=(--tag "${GH_REPOSITORY}:${RELEASE_VERSION}-arm64")

LABELS=(
Expand Down Expand Up @@ -45,11 +44,6 @@ UBI_ARGS=(
--target cass-config-builder-ubi
)

UBI8_ARGS=(
"${COMMON_ARGS[@]}"
--target cass-config-builder-ubi-8
)

# GitHub packages does not presently support multiarch images, so we
# will have to create independent tags for each arch. This feature is
# coming though:
Expand All @@ -75,19 +69,7 @@ docker buildx build --load \
--platform linux/amd64 \
.

docker buildx build --load \
"${GH_UBI8_TAGS[@]}" \
"${UBI8_ARGS[@]}" \
--platform linux/amd64 \
.

docker buildx build --load \
"${GH_UBI8_TAGS[@]}" \
"${UBI8_ARGS[@]}" \
--platform linux/arm64 \
.

TAGS_TO_PUSH=("${GH_ARM64_TAGS[@]}" "${GH_TAGS[@]}" "${GH_UBI_TAGS[@]}" "${GH_UBI8_TAGS[@]}")
TAGS_TO_PUSH=("${GH_ARM64_TAGS[@]}" "${GH_TAGS[@]}" "${GH_UBI_TAGS[@]}")
echo "Pushing tags: " "${TAGS_TO_PUSH[@]}"

# Note: Every even index of TAGS_TO_PUSH will be the string '--tag'
Expand Down

0 comments on commit 098f8a3

Please sign in to comment.