Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deprecate c8s images, as EOL for c8s is 31th of May 2024 #371

Merged
merged 1 commit into from
Jun 5, 2024
Merged

deprecate c8s images, as EOL for c8s is 31th of May 2024 #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Dockerfile for the scripts to know which versions to build.

`OS`
OS version you want to build the images for. Currently the scripts are able to build for
centos (default), centos6, c8s, c9s, rhel7, rhel8, rhel9, and fedora.
centos (default), centos6, c9s, rhel7, rhel8, rhel9, and fedora.

`SKIP_SQUASH`
When set to 1 the build script will skip the squash phase of the build.
Expand Down
2 changes: 1 addition & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# This script is used to build the OpenShift Docker images.
#
# OS - Specifies distribution - "rhel7", "rhel8", "rhel9", "centos7", "c8s", "c9s" or "fedora"
# OS - Specifies distribution - "rhel7", "rhel8", "rhel9", "centos7", "c9s" or "fedora"
# VERSION - Specifies the image version - (must match with subdirectory in repo)
# SINGLE_VERSION - Specifies the image version - (must match with subdirectory in repo)
# VERSIONS - Must be set to a list with possible versions (subdirectories)
Expand Down
4 changes: 0 additions & 4 deletions common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ else ifeq ($(TARGET),fedora)
else ifeq ($(TARGET),centos6)
OS := centos6
DOCKERFILE ?= Dockerfile.centos6
else ifeq ($(TARGET),c8s)
OS := c8s
DOCKERFILE ?= Dockerfile.c8s
REGISTRY := quay.io/
else ifeq ($(TARGET),c9s)
OS := c9s
DOCKERFILE ?= Dockerfile.c9s
Expand Down
2 changes: 0 additions & 2 deletions test-lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,8 +814,6 @@ ct_get_public_image_name() {
public_image_name=$registry/rhel9/$base_image_name-${version//./}
elif [ "$os" == "centos7" ]; then
public_image_name=$registry/centos7/$base_image_name-${version//./}-centos7:centos7
elif [ "$os" == "c8s" ]; then
public_image_name=$registry/sclorg/$base_image_name-${version//./}-c8s
elif [ "$os" == "c9s" ]; then
public_image_name=$registry/sclorg/$base_image_name-${version//./}-c9s
fi
Expand Down
2 changes: 1 addition & 1 deletion test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ for dir in ${VERSIONS}; do
# Kept also IMAGE_NAME as some tests might still use that.
IMAGE_NAME="$(docker inspect -f "{{.Config.Labels.name}}" "$IMAGE_ID"):$IMAGE_VERSION"
# shellcheck disable=SC2268
if [ "${OS}" == "centos7" ] || [ "${OS}" == "c9s" ] || [ "${OS}" == "fedora" ] || [ "${OS}" == "c8s" ]; then
if [ "${OS}" == "centos7" ] || [ "${OS}" == "c9s" ] || [ "${OS}" == "fedora" ]; then
export IMAGE_NAME="$REGISTRY$IMAGE_NAME"
else
export IMAGE_NAME
Expand Down
Loading