Skip to content

Revert back to UBI 8 for 23.0.0.10 #550

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

Merged
mbroz2 merged 2 commits into from
Oct 9, 2023
Merged

Revert back to UBI 8 for 23.0.0.10 #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d88541
Revert "Update image labels to specify UBI 9"
tjwatson Oct 6, 2023
6b98a09
Revert "Update to UBI 9 (23.0.0.10+)"
tjwatson Oct 6, 2023
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
10 changes: 5 additions & 5 deletions ga/23.0.0.10/kernel/Dockerfile.ubi.ibmjava8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM ibmjava:8-ubi9 AS getRuntime
FROM ibmjava:8-ubi AS getRuntime

USER root

Expand All @@ -38,7 +38,7 @@ RUN yum -y install unzip wget openssl \
&& chmod -R g+rw /opt/ibm/wlp \
&& cp -a /opt/ibm/wlp/lafiles/. /licenses/

FROM ibmjava:8-ubi9
FROM ibmjava:8-ubi

USER root

Expand All @@ -54,13 +54,13 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \
org.opencontainers.image.version="$LIBERTY_VERSION" \
org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM's Java and Red Hat's UBI 9 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \
org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM's Java and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \
org.opencontainers.image.title="IBM WebSphere Liberty" \
vendor="IBM" \
name="IBM WebSphere Liberty" \
version="$LIBERTY_VERSION" \
summary="Image for WebSphere Liberty with IBM's Java and Red Hat's UBI 9" \
description="This image contains the WebSphere Liberty runtime with IBM's Java and Red Hat's UBI 9 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template"
summary="Image for WebSphere Liberty with IBM's Java and Red Hat's UBI 8" \
description="This image contains the WebSphere Liberty runtime with IBM's Java and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template"

ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build

Expand Down
10 changes: 5 additions & 5 deletions ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk11
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi9 AS getRuntime
FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi AS getRuntime

USER root

Expand All @@ -38,7 +38,7 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
&& chmod -R g+rw /opt/ibm/wlp \
&& cp -a /opt/ibm/wlp/lafiles/. /licenses/

FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi9
FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi

USER root

Expand All @@ -54,13 +54,13 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \
org.opencontainers.image.version="$LIBERTY_VERSION" \
org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \
org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \
org.opencontainers.image.title="IBM WebSphere Liberty" \
vendor="IBM" \
name="IBM WebSphere Liberty" \
version="$LIBERTY_VERSION" \
summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9" \
description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template"
summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \
description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template"

ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build

Expand Down
10 changes: 5 additions & 5 deletions ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk17
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi9 AS getRuntime
FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi AS getRuntime

USER root

Expand All @@ -38,7 +38,7 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
&& chmod -R g+rw /opt/ibm/wlp \
&& cp -a /opt/ibm/wlp/lafiles/. /licenses/

FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi9
FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi

USER root

Expand All @@ -54,13 +54,13 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \
org.opencontainers.image.version="$LIBERTY_VERSION" \
org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \
org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \
org.opencontainers.image.title="IBM WebSphere Liberty" \
vendor="IBM" \
name="IBM WebSphere Liberty" \
version="$LIBERTY_VERSION" \
summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9" \
description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template"
summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \
description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template"

ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build

Expand Down
10 changes: 5 additions & 5 deletions ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi9 AS getRuntime
FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi AS getRuntime

USER root

Expand All @@ -38,7 +38,7 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
&& chmod -R g+rw /opt/ibm/wlp \
&& cp -a /opt/ibm/wlp/lafiles/. /licenses/

FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi9
FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi

USER root

Expand All @@ -54,13 +54,13 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \
org.opencontainers.image.version="$LIBERTY_VERSION" \
org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \
org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \
org.opencontainers.image.title="IBM WebSphere Liberty" \
vendor="IBM" \
name="IBM WebSphere Liberty" \
version="$LIBERTY_VERSION" \
summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9" \
description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template"
summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \
description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template"

ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build

Expand Down
10 changes: 5 additions & 5 deletions ga/latest/kernel/Dockerfile.ubi.ibmjava8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM ibmjava:8-ubi9 AS getRuntime
FROM ibmjava:8-ubi AS getRuntime

USER root

Expand All @@ -38,7 +38,7 @@ RUN yum -y install unzip wget openssl \
&& chmod -R g+rw /opt/ibm/wlp \
&& cp -a /opt/ibm/wlp/lafiles/. /licenses/

FROM ibmjava:8-ubi9
FROM ibmjava:8-ubi

USER root

Expand All @@ -54,13 +54,13 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \
org.opencontainers.image.version="$LIBERTY_VERSION" \
org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM's Java and Red Hat's UBI 9 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \
org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM's Java and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \
org.opencontainers.image.title="IBM WebSphere Liberty" \
vendor="IBM" \
name="IBM WebSphere Liberty" \
version="$LIBERTY_VERSION" \
summary="Image for WebSphere Liberty with IBM's Java and Red Hat's UBI 9" \
description="This image contains the WebSphere Liberty runtime with IBM's Java and Red Hat's UBI 9 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template"
summary="Image for WebSphere Liberty with IBM's Java and Red Hat's UBI 8" \
description="This image contains the WebSphere Liberty runtime with IBM's Java and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template"

ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build

Expand Down
10 changes: 5 additions & 5 deletions ga/latest/kernel/Dockerfile.ubi.openjdk11
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi9 AS getRuntime
FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi AS getRuntime

USER root

Expand All @@ -38,7 +38,7 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
&& chmod -R g+rw /opt/ibm/wlp \
&& cp -a /opt/ibm/wlp/lafiles/. /licenses/

FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi9
FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi

USER root

Expand All @@ -54,13 +54,13 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \
org.opencontainers.image.version="$LIBERTY_VERSION" \
org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \
org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \
org.opencontainers.image.title="IBM WebSphere Liberty" \
vendor="IBM" \
name="IBM WebSphere Liberty" \
version="$LIBERTY_VERSION" \
summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9" \
description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template"
summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \
description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template"

ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build

Expand Down
10 changes: 5 additions & 5 deletions ga/latest/kernel/Dockerfile.ubi.openjdk17
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi9 AS getRuntime
FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi AS getRuntime

USER root

Expand All @@ -38,7 +38,7 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
&& chmod -R g+rw /opt/ibm/wlp \
&& cp -a /opt/ibm/wlp/lafiles/. /licenses/

FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi9
FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi

USER root

Expand All @@ -54,13 +54,13 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \
org.opencontainers.image.version="$LIBERTY_VERSION" \
org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \
org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \
org.opencontainers.image.title="IBM WebSphere Liberty" \
vendor="IBM" \
name="IBM WebSphere Liberty" \
version="$LIBERTY_VERSION" \
summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9" \
description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template"
summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \
description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template"

ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build

Expand Down
10 changes: 5 additions & 5 deletions ga/latest/kernel/Dockerfile.ubi.openjdk8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi9 AS getRuntime
FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi AS getRuntime

USER root

Expand All @@ -38,7 +38,7 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
&& chmod -R g+rw /opt/ibm/wlp \
&& cp -a /opt/ibm/wlp/lafiles/. /licenses/

FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi9
FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi

USER root

Expand All @@ -54,13 +54,13 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \
org.opencontainers.image.version="$LIBERTY_VERSION" \
org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \
org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \
org.opencontainers.image.title="IBM WebSphere Liberty" \
vendor="IBM" \
name="IBM WebSphere Liberty" \
version="$LIBERTY_VERSION" \
summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9" \
description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template"
summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \
description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template"

ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build

Expand Down