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.

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

Get images from icr instead of docker #64

Merged
merged 1 commit into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
target
.DS_Store

.vscode
8 changes: 4 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/bin/bash -e
SCRIPT_DIR=$(dirname $0)

JAVA8_BASE_IMAGE_NAME="${NAMESPACE:=ibmcom}/websphere-liberty:${LIBERTY_VERSION}-full-java8-openj9-ubi"
JAVA11_BASE_IMAGE_NAME="${NAMESPACE:=ibmcom}/websphere-liberty:${LIBERTY_VERSION}-full-java11-openj9-ubi"
JAVA17_BASE_IMAGE_NAME="${NAMESPACE:=ibmcom}/websphere-liberty:${LIBERTY_VERSION}-full-java17-openj9-ubi"
JAVA21_BASE_IMAGE_NAME="${NAMESPACE:=ibmcom}/websphere-liberty:${LIBERTY_VERSION}-full-java21-openj9-ubi-minimal"
JAVA8_BASE_IMAGE_NAME="${NAMESPACE:=icr.io}/appcafe/websphere-liberty:${LIBERTY_VERSION}-full-java8-openj9-ubi"
JAVA11_BASE_IMAGE_NAME="${NAMESPACE:=icr.io}/appcafe/websphere-liberty:${LIBERTY_VERSION}-full-java11-openj9-ubi"
JAVA17_BASE_IMAGE_NAME="${NAMESPACE:=icr.io}/appcafe/websphere-liberty:${LIBERTY_VERSION}-full-java17-openj9-ubi"
JAVA21_BASE_IMAGE_NAME="${NAMESPACE:=icr.io}/appcafe/websphere-liberty:${LIBERTY_VERSION}-full-java21-openj9-ubi-minimal"

echo "Building Java 8 Builder Image ${JAVA8_BASE_IMAGE_NAME}"
pushd ${SCRIPT_DIR}/images/java8/builder
Expand Down
2 changes: 1 addition & 1 deletion images/java11/builder/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ schema_version: 1

name: ibmcom/websphere-liberty-s2i
version: 20.0.0.12-java11
from: ibmcom/websphere-liberty:20.0.0.12-full-java11-openj9-ubi
from: icr.io/appcafe/websphere-liberty:20.0.0.12-full-java11-openj9-ubi
description: "IBM WebSphere Liberty UBI image with OpenJDK8"
labels:
- name: io.k8s.description
Expand Down
2 changes: 1 addition & 1 deletion images/java11/runtime/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ schema_version: 1

name: ibmcom/websphere-liberty-s2i
version: 20.0.0.12-runtime-java11
from: ibmcom/websphere-liberty:20.0.0.12-full-java11-openj9-ubi
from: icr.io/appcafe/websphere-liberty:20.0.0.12-full-java11-openj9-ubi
description: "IBM WebSphere Liberty UBI runtime image with OpenJDK 11"
labels:
- name: io.k8s.description
Expand Down
2 changes: 1 addition & 1 deletion images/java17/builder/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ schema_version: 1

name: ibmcom/websphere-liberty-s2i
version: 23.0.0.1-java17
from: ibmcom/websphere-liberty:23.0.0.1-full-java17-openj9-ubi
from: icr.io/appcafe/websphere-liberty:23.0.0.1-full-java17-openj9-ubi
description: "IBM WebSphere Liberty UBI image with OpenJDK17"
labels:
- name: io.k8s.description
Expand Down
2 changes: 1 addition & 1 deletion images/java17/runtime/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ schema_version: 1

name: ibmcom/websphere-liberty-s2i
version: 23.0.0.1-runtime-java17
from: ibmcom/websphere-liberty:23.0.0.1-full-java17-openj9-ubi
from: icr.io/appcafe/websphere-liberty:23.0.0.1-full-java17-openj9-ubi
description: "IBM WebSphere Liberty UBI runtime image with OpenJDK 17"
labels:
- name: io.k8s.description
Expand Down
2 changes: 1 addition & 1 deletion images/java21/builder/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ schema_version: 1

name: ibmcom/websphere-liberty-s2i
version: 24.0.0.1-java21
from: ibmcom/websphere-liberty:24.0.0.1-full-java21-openj9-ubi
from: icr.io/appcafe/websphere-liberty:24.0.0.1-full-java21-openj9-ubi
description: "IBM WebSphere Liberty UBI image with OpenJDK21"
labels:
- name: io.k8s.description
Expand Down
2 changes: 1 addition & 1 deletion images/java21/runtime/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ schema_version: 1

name: ibmcom/websphere-liberty-s2i
version: 24.0.0.1-runtime-java21
from: ibmcom/websphere-liberty:24.0.0.1-full-java21-openj9-ubi
from: icr.io/appcafe/websphere-liberty:24.0.0.1-full-java21-openj9-ubi
description: "IBM WebSphere Liberty UBI runtime image with OpenJDK 21"
labels:
- name: io.k8s.description
Expand Down
2 changes: 1 addition & 1 deletion images/java8/builder/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ schema_version: 1

name: ibmcom/websphere-liberty-s2i
version: 20.0.0.12-java8
from: ibmcom/websphere-liberty:20.0.0.12-full-java8-openj9-ubi
from: icr.io/appcafe/websphere-liberty:20.0.0.12-full-java8-openj9-ubi
description: "IBM WebSphere Liberty UBI image with OpenJDK8"
labels:
- name: io.k8s.description
Expand Down
2 changes: 1 addition & 1 deletion images/java8/runtime/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ schema_version: 1

name: ibmcom/websphere-liberty-s2i
version: 20.0.0.12-runtime-java8
from: ibmcom/websphere-liberty:20.0.0.12-full-java8-openj9-ubi
from: icr.io/appcafe/websphere-liberty:20.0.0.12-full-java8-openj9-ubi
description: "IBM WebSphere Liberty UBI image with OpenJDK8"

labels:
Expand Down
Loading