From 4f209d6fefd9fb402db4bce60879a9eba784c8c0 Mon Sep 17 00:00:00 2001 From: SteveSamJacob19 Date: Fri, 29 Mar 2024 21:51:30 +0530 Subject: [PATCH 1/6] Fixed cutting of doc toc --- src/main/content/antora_ui/src/sass/nav.scss | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/main/content/antora_ui/src/sass/nav.scss b/src/main/content/antora_ui/src/sass/nav.scss index 8cc0fde799..5ccb4ce78b 100644 --- a/src/main/content/antora_ui/src/sass/nav.scss +++ b/src/main/content/antora_ui/src/sass/nav.scss @@ -242,9 +242,6 @@ html.is-clipped--nav { margin-left: calc( -1 * (var(--TOC-indention-first-level) + var(--TOC-indention)) ); - margin-right: calc( - -1 * (var(--TOC-indention-first-level) + var(--TOC-indention)) - ); padding-left: calc( var(--TOC-indention-first-level) + var(--TOC-indention) - var(--TOC-orange-border-width) @@ -261,9 +258,6 @@ html.is-clipped--nav { margin-left: calc( -1 * (var(--TOC-indention-first-level) + 2 * var(--TOC-indention)) ); - margin-right: calc( - -1 * (var(--TOC-indention-first-level) + 2 * var(--TOC-indention)) - ); padding-left: calc( var(--TOC-indention-first-level) + 2 * var(--TOC-indention) - var(--TOC-orange-border-width) @@ -280,9 +274,6 @@ html.is-clipped--nav { margin-left: calc( -1 * (var(--TOC-indention-first-level) + 3 * var(--TOC-indention)) ); - margin-right: calc( - -1 * (var(--TOC-indention-first-level) + 3 * var(--TOC-indention)) - ); padding-left: calc( var(--TOC-indention-first-level) + 3 * var(--TOC-indention) - var(--TOC-orange-border-width) @@ -299,9 +290,6 @@ html.is-clipped--nav { margin-left: calc( -1 * (var(--TOC-indention-first-level) + 4 * var(--TOC-indention)) ); - margin-right: calc( - -1 * (var(--TOC-indention-first-level) + 4 * var(--TOC-indention)) - ); padding-left: calc( var(--TOC-indention-first-level) + 4 * var(--TOC-indention) - var(--TOC-orange-border-width) From 937f0a8253254f99e9c0c3298ed9e7e473170455 Mon Sep 17 00:00:00 2001 From: SteveSamJacob19 Date: Fri, 12 Apr 2024 12:53:23 +0530 Subject: [PATCH 2/6] Fixed it for api/spi too --- src/main/content/antora_ui/src/sass/nav.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/content/antora_ui/src/sass/nav.scss b/src/main/content/antora_ui/src/sass/nav.scss index 5ccb4ce78b..791880767a 100644 --- a/src/main/content/antora_ui/src/sass/nav.scss +++ b/src/main/content/antora_ui/src/sass/nav.scss @@ -211,6 +211,14 @@ html.is-clipped--nav { } } +.nav-item[data-depth="3"]{ + display: block; + overflow-wrap: break-word; + & > a{ + display: block; + } +} + .nav-item.is-active { & > .nav-item-toggle { background: transparent url(../img/chevron.svg) no-repeat center / 50%; From a22081ce97f958a2e85a7920a8c7f3d8620b2533 Mon Sep 17 00:00:00 2001 From: SteveSamJacob19 Date: Fri, 5 Apr 2024 11:46:21 +0530 Subject: [PATCH 3/6] Removed twitter from blog end --- src/main/content/_i18n/en.yml | 5 ++--- src/main/content/_i18n/ja.yml | 4 +--- src/main/content/_i18n/zh-Hans.yml | 5 ++--- src/main/content/blog.html | 10 ++++------ 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/main/content/_i18n/en.yml b/src/main/content/_i18n/en.yml index 0317ee08f5..c2360f71f5 100644 --- a/src/main/content/_i18n/en.yml +++ b/src/main/content/_i18n/en.yml @@ -246,9 +246,8 @@ blog: posts_in_other_languages: Posts in other languages post_in_other_lang: Post available in languages follow: - part1: Follow - part2: on Twitter or subscribe to our - part3: feed. + part1: Subscribe to our + part2: feed. tags: announcements: announcements microprofile: microprofile diff --git a/src/main/content/_i18n/ja.yml b/src/main/content/_i18n/ja.yml index 99e8a4e106..886d7a337b 100644 --- a/src/main/content/_i18n/ja.yml +++ b/src/main/content/_i18n/ja.yml @@ -246,9 +246,7 @@ blog: posts_in_other_languages: 他の言語での投稿 post_in_other_lang: 他言語版へのリンク follow: - part1: Twitter で - part2: をフォローするか、 - part3: フィードを購読します。 + part2: フィードを購読します。 tags: announcements: 発表 microprofile: microprofile diff --git a/src/main/content/_i18n/zh-Hans.yml b/src/main/content/_i18n/zh-Hans.yml index 05fca85c98..6ebf23b995 100644 --- a/src/main/content/_i18n/zh-Hans.yml +++ b/src/main/content/_i18n/zh-Hans.yml @@ -245,9 +245,8 @@ blog: posts_in_other_languages: 其他语文的员额 post_in_other_lang: 以其他语言提供的职位 follow: - part1: 请务必在 Twitter 上关注 - part2: 或订阅我们的 - part3: 订阅源。 + part1: 订阅我们的 + part2: 订阅源。 tags: announcements: 公告 microprofile: microprofile diff --git a/src/main/content/blog.html b/src/main/content/blog.html index 38d42a6261..a9c00a544e 100644 --- a/src/main/content/blog.html +++ b/src/main/content/blog.html @@ -395,15 +395,13 @@

{% t blog.stay_light_years_ahead %}

- {% t blog.follow.part1 %} - - @openliberty.io - - {% t blog.follow.part2 %} + {% if site.lang != 'ja' %} + {% t blog.follow.part1 %} + {% endif %} RSS - {% t blog.follow.part3 %} + {% t blog.follow.part2 %}

From df4ed5539f147e762fe2640e58ec3ff98fc56e2b Mon Sep 17 00:00:00 2001 From: SteveSamJacob19 Date: Tue, 9 Apr 2024 19:19:35 +0530 Subject: [PATCH 4/6] Removed twitter lines of code --- .../content/_assets/css/certification.scss | 14 ------ src/main/content/_assets/css/header.scss | 6 +-- src/main/content/_assets/css/home.scss | 47 ------------------- src/main/content/_assets/css/openliberty.scss | 7 --- src/main/content/_assets/css/post.scss | 14 ------ src/main/content/_assets/css/support.scss | 19 -------- src/main/content/_assets/js/home.js | 7 --- src/main/content/_config.yml | 1 - src/main/content/_i18n/en.yml | 1 - src/main/content/_i18n/ja.yml | 1 - src/main/content/_i18n/zh-Hans.yml | 1 - src/main/content/_includes/head.html | 4 -- .../antora_ui/src/partials/head-meta.hbs | 16 ------- .../content/antora_ui/src/sass/header.scss | 6 +-- .../antora_ui/src/sass/openliberty.scss | 7 --- .../openliberty/website/SecurityFilter.java | 2 +- .../io/openliberty/website/TLSFilter.java | 2 +- 17 files changed, 4 insertions(+), 151 deletions(-) diff --git a/src/main/content/_assets/css/certification.scss b/src/main/content/_assets/css/certification.scss index 824e70a617..38a6a9547c 100644 --- a/src/main/content/_assets/css/certification.scss +++ b/src/main/content/_assets/css/certification.scss @@ -247,20 +247,6 @@ } } -.twitter_link { - display: inline-block; - width: 27px; - height: 23px; - background-image: url('/img/twitter_link.svg'); - background-repeat: no-repeat; - vertical-align: middle; - transition: all .2s; - - &:hover { - background-image: url('/img/twitter_link_hover.svg'); - } -} - .reddit_link { display: inline-block; width: 30px; diff --git a/src/main/content/_assets/css/header.scss b/src/main/content/_assets/css/header.scss index a67d0858d9..5e777a5ce7 100644 --- a/src/main/content/_assets/css/header.scss +++ b/src/main/content/_assets/css/header.scss @@ -183,11 +183,7 @@ width: 95%; border-top: 1px solid rgba(201, 214, 254, 0.35); } - - #header_twitter_link { - background-image: url("/img/Header_TwitterBird.svg"); - } - + #header_stackoverflow_link { background-image: url("/img/Header_StackO.svg"); } diff --git a/src/main/content/_assets/css/home.scss b/src/main/content/_assets/css/home.scss index ce3ac76a81..1c42013829 100644 --- a/src/main/content/_assets/css/home.scss +++ b/src/main/content/_assets/css/home.scss @@ -678,55 +678,12 @@ body { font-size: 16px; } -#twitter_follow_div { - box-shadow: 0 2px 4px 0 rgba(63, 70, 89, 0.31); - border-radius: 3px; - padding: 14px 22px; - margin-bottom: 18px; - background: #ffffff; -} #ufo_logo { width: 59px; height: 43px; } -#twitter_handle { - display: inline-block; - font-size: 22px; - color: #5d6a8e; - margin-bottom: 0px; - - &:hover { - color: #3f4659; - } -} - -#twitter_link { - display: inline-block; - float: right; - font-size: 16px; - font-weight: 500; - color: #24253a; - background-color: #abd155; - border-radius: 7px; - padding: 8px 0px; - text-align: center; - transition: background-color 0.2s; - width: 130px; - - &:hover { - color: #24253a; - background-color: #c7ee63; - } -} - -#twitter_iframe_div { - box-shadow: 0 2px 4px 0 rgba(63, 70, 89, 0.31); - border-radius: 3px; - margin-bottom: 60px; -} - /* SUPPORT */ #support_background { @@ -1466,10 +1423,6 @@ body { display: none; } - #twitter_link { - margin-top: -3px; - } - #support_container { padding-top: 60px; } diff --git a/src/main/content/_assets/css/openliberty.scss b/src/main/content/_assets/css/openliberty.scss index 1ae22e9977..5b556b32a6 100644 --- a/src/main/content/_assets/css/openliberty.scss +++ b/src/main/content/_assets/css/openliberty.scss @@ -489,13 +489,6 @@ footer { } } - #footer_twitter_link { - background-image: url("/img/Footer_TwitterBird.svg"); - &:hover { - background-image: url("/img/Footer_TwitterBird_Hover.svg"); - } - } - #footer_stackoverflow_link { background-image: url("/img/Footer_StackO.svg"); &:hover { diff --git a/src/main/content/_assets/css/post.scss b/src/main/content/_assets/css/post.scss index 379c4a317d..fe1103c3a1 100644 --- a/src/main/content/_assets/css/post.scss +++ b/src/main/content/_assets/css/post.scss @@ -268,20 +268,6 @@ $tag_lang_font_size: 14px; } } -.twitter_link { - display: inline-block; - width: 27px; - height: 23px; - background-image: url('/img/twitter_link.svg'); - background-repeat: no-repeat; - vertical-align: middle; - transition: all .2s; - - &:hover { - background-image: url('/img/twitter_link_hover.svg'); - } -} - .reddit_link { display: inline-block; width: 30px; diff --git a/src/main/content/_assets/css/support.scss b/src/main/content/_assets/css/support.scss index ab77297ad7..cdadebb2e1 100644 --- a/src/main/content/_assets/css/support.scss +++ b/src/main/content/_assets/css/support.scss @@ -202,13 +202,6 @@ body { margin-bottom: 0px; } -#twitter_logo { - position: relative; - width: 120px; - height: 94px; - top: 50px; -} - #stack_overflow_logo { position: relative; width: 100px; @@ -496,18 +489,6 @@ body { width: 77px; height: 79px; } - - #twitter_logo_background { - margin-bottom: -82px; - } - - #twitter_logo { - position: relative; - width: 45px; - height: 35px; - top: 23px; - margin-left: 16px !important; - } #stack_overflow_logo_background { margin-bottom: -94px; diff --git a/src/main/content/_assets/js/home.js b/src/main/content/_assets/js/home.js index 7591916d6b..e25a64e06c 100644 --- a/src/main/content/_assets/js/home.js +++ b/src/main/content/_assets/js/home.js @@ -34,13 +34,6 @@ function startAnimation() { } $(document).ready(function() { - // add custom css to twitter iframe - $('#twitter_iframe_div').on('DOMSubtreeModified propertychange',"#twitter-widget-0", function() { - $(".twitter-timeline").contents().find(".timeline-Tweet-media").css("display", "none"); - $(".twitter-timeline").contents().find(".timeline-Tweet-text").css({"font-size": "16px", "margin-bottom": "-10px"}); - $(".twitter-timeline").contents().find(".timeline-Body").css("border-bottom", "none"); - }); - $(window).on('scroll', function(event) { // start animation if images are in viewport if ($('#beam').isInViewport()) { diff --git a/src/main/content/_config.yml b/src/main/content/_config.yml index 2c4ef96cea..578ed35be3 100644 --- a/src/main/content/_config.yml +++ b/src/main/content/_config.yml @@ -4,7 +4,6 @@ description: > Open Liberty is the most flexible server runtime available to Earth’s Java developers. baseurl: "" url: "https://openliberty.io" -twitter_username: openlibertyio github_username: NottyCode asciidoctor: diff --git a/src/main/content/_i18n/en.yml b/src/main/content/_i18n/en.yml index c2360f71f5..af1ad62d37 100644 --- a/src/main/content/_i18n/en.yml +++ b/src/main/content/_i18n/en.yml @@ -1,7 +1,6 @@ global: openliberty: Open Liberty ol_logo_subtitile: An IBM Open Source Project - twitter: Twitter learnmore: Learn more readmore: Read more and: and diff --git a/src/main/content/_i18n/ja.yml b/src/main/content/_i18n/ja.yml index 886d7a337b..884c8968d5 100644 --- a/src/main/content/_i18n/ja.yml +++ b/src/main/content/_i18n/ja.yml @@ -1,7 +1,6 @@ global: openliberty: Open Liberty ol_logo_subtitile: An IBM Open Source Project - twitter: Twitter learnmore: Learn more readmore: 詳細はこちら and: and diff --git a/src/main/content/_i18n/zh-Hans.yml b/src/main/content/_i18n/zh-Hans.yml index 6ebf23b995..28d8ccabd2 100644 --- a/src/main/content/_i18n/zh-Hans.yml +++ b/src/main/content/_i18n/zh-Hans.yml @@ -1,7 +1,6 @@ global: openliberty: Open Liberty ol_logo_subtitile: IBM 开放式源代码项目 - twitter: Twitter learnmore: Learn more readmore: 阅读更多 and: and diff --git a/src/main/content/_includes/head.html b/src/main/content/_includes/head.html index 7709c7eebf..8679f66803 100644 --- a/src/main/content/_includes/head.html +++ b/src/main/content/_includes/head.html @@ -64,10 +64,6 @@ - - - - diff --git a/src/main/content/antora_ui/src/partials/head-meta.hbs b/src/main/content/antora_ui/src/partials/head-meta.hbs index afdc80a943..c45cbbbb4c 100644 --- a/src/main/content/antora_ui/src/partials/head-meta.hbs +++ b/src/main/content/antora_ui/src/partials/head-meta.hbs @@ -11,22 +11,6 @@ {{/if}} - - -{{#if page.attributes.seo-title }} - -{{ else }} - -{{/if}} -{{#if page.attributes.seo-description }} - -{{else if page.attributes.description }} - -{{ else }} - -{{/if}} - - {{!-- OpenGraph Tags --}} {{#if page.attributes.seo-title }} diff --git a/src/main/content/antora_ui/src/sass/header.scss b/src/main/content/antora_ui/src/sass/header.scss index cafdbc253c..8ca34f803f 100644 --- a/src/main/content/antora_ui/src/sass/header.scss +++ b/src/main/content/antora_ui/src/sass/header.scss @@ -187,11 +187,7 @@ width: 95%; border-top: 1px solid rgba(201, 214, 254, 0.35); } - - #header_twitter_link { - background-image: url("../../_/img/Header_TwitterBird.svg"); - } - + #header_stackoverflow_link { background-image: url("../../_/img/Header_StackO.svg"); } diff --git a/src/main/content/antora_ui/src/sass/openliberty.scss b/src/main/content/antora_ui/src/sass/openliberty.scss index bf54b100d4..b502fac0e2 100644 --- a/src/main/content/antora_ui/src/sass/openliberty.scss +++ b/src/main/content/antora_ui/src/sass/openliberty.scss @@ -454,13 +454,6 @@ footer { } } - #footer_twitter_link { - background-image: url("../../_/img/Footer_TwitterBird.svg"); - &:hover { - background-image: url("../../_/img/Footer_TwitterBird_Hover.svg"); - } - } - #footer_stackoverflow_link { background-image: url("../../_/img/Footer_StackO.svg"); &:hover { diff --git a/src/main/java/io/openliberty/website/SecurityFilter.java b/src/main/java/io/openliberty/website/SecurityFilter.java index 8c6a378097..936377809f 100644 --- a/src/main/java/io/openliberty/website/SecurityFilter.java +++ b/src/main/java/io/openliberty/website/SecurityFilter.java @@ -71,7 +71,7 @@ public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain response.setHeader("X-Content-Type-Options", "nosniff"); // Mitigating cross site scripting (XSS) from other domains. response.setHeader("Content-Security-Policy", - "default-src 'self' 'unsafe-inline' 'unsafe-eval' cdn.jsdelivr.net fonts.googleapis.com ajax.googleapis.com code.jquery.com fonts.gstatic.com *.githubusercontent.com api.github.com www.googletagmanager.com tagmanager.google.com www.google-analytics.com cdnjs.cloudflare.com data: buttons.github.io www.youtube.com *.twitter.com *.twimg.com video.ibm.com https://start.openliberty.io/ gitlab.com starter-staging.rh9j6zz75er.us-east.codeengine.appdomain.cloud https://docs.oracle.com/javase/8/docs/api/"); + "default-src 'self' 'unsafe-inline' 'unsafe-eval' cdn.jsdelivr.net fonts.googleapis.com ajax.googleapis.com code.jquery.com fonts.gstatic.com *.githubusercontent.com api.github.com www.googletagmanager.com tagmanager.google.com www.google-analytics.com cdnjs.cloudflare.com data: buttons.github.io www.youtube.com video.ibm.com https://start.openliberty.io/ gitlab.com starter-staging.rh9j6zz75er.us-east.codeengine.appdomain.cloud https://docs.oracle.com/javase/8/docs/api/"); // Limits the information sent cross-domain and does not send the origin name. response.setHeader("Referrer-Policy", "no-referrer"); diff --git a/src/main/java/io/openliberty/website/TLSFilter.java b/src/main/java/io/openliberty/website/TLSFilter.java index 5833d04a71..fa20ffcd89 100644 --- a/src/main/java/io/openliberty/website/TLSFilter.java +++ b/src/main/java/io/openliberty/website/TLSFilter.java @@ -71,7 +71,7 @@ public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain response.setHeader("X-Content-Type-Options", "nosniff"); // Mitigating cross site scripting (XSS) from other domains. response.setHeader("Content-Security-Policy", - "default-src 'self' 'unsafe-inline' 'unsafe-eval' cdn.jsdelivr.net fonts.googleapis.com ajax.googleapis.com code.jquery.com fonts.gstatic.com *.githubusercontent.com api.github.com www.googletagmanager.com tagmanager.google.com www.google-analytics.com cdnjs.cloudflare.com data: buttons.github.io www.youtube.com *.twitter.com *.twimg.com video.ibm.com https://start.openliberty.io/ gitlab.com starter-staging.rh9j6zz75er.us-east.codeengine.appdomain.cloud https://docs.oracle.com/javase/8/docs/api/"); + "default-src 'self' 'unsafe-inline' 'unsafe-eval' cdn.jsdelivr.net fonts.googleapis.com ajax.googleapis.com code.jquery.com fonts.gstatic.com *.githubusercontent.com api.github.com www.googletagmanager.com tagmanager.google.com www.google-analytics.com cdnjs.cloudflare.com data: buttons.github.io www.youtube.com video.ibm.com https://start.openliberty.io/ gitlab.com starter-staging.rh9j6zz75er.us-east.codeengine.appdomain.cloud https://docs.oracle.com/javase/8/docs/api/"); // Limits the information sent cross-domain and does not send the origin name. response.setHeader("Referrer-Policy", "no-referrer"); From 4b35e2a162d0364f2fa039e2e4820be1525b1d10 Mon Sep 17 00:00:00 2001 From: SteveSamJacob19 Date: Thu, 25 Apr 2024 13:05:12 +0530 Subject: [PATCH 5/6] Edited contributing.md --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 40d3563c84..3d296eb108 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,6 +2,8 @@ Anyone can contribute to the openliberty.io project and we welcome your contributions! +https://github.com/OpenLiberty/openliberty.io/wiki/How-to-contribute + ## Contributor License Agreement In order for us to accept pull requests, you must declare that you wrote the code or, at least, have the right to contribute it to the repo under the open source licence of the project in the repo. It's dead easy... From 5835f5bc22b31cab53372061be871c7cb1ffb8ec Mon Sep 17 00:00:00 2001 From: navaneethsnair1 Date: Thu, 9 May 2024 22:09:53 +0530 Subject: [PATCH 6/6] ol-container images update --- docker/Dockerfile.demo | 2 +- docker/Dockerfile.draft | 2 +- docker/Dockerfile.prod | 2 +- docker/Dockerfile.staging | 2 +- docker/blogs/Dockerfile.blogs.draft | 2 +- docker/blogs/Dockerfile.blogs.staging | 2 +- docker/certifications/Dockerfile.certifications.draft | 2 +- docker/certifications/Dockerfile.certifications.staging | 2 +- docker/docs/Dockerfile.docs.draft | 2 +- docker/docs/Dockerfile.docs.staging | 2 +- docker/guides/Dockerfile.guides.draft | 2 +- docker/guides/Dockerfile.guides.staging | 2 +- docker/ui-only/Dockerfile.ui-only | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docker/Dockerfile.demo b/docker/Dockerfile.demo index dba0a54a63..b6251de69f 100644 --- a/docker/Dockerfile.demo +++ b/docker/Dockerfile.demo @@ -49,7 +49,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded # # # -FROM icr.io/appcafe/open-liberty:24.0.0.2-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.4-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/Dockerfile.draft b/docker/Dockerfile.draft index 20423b3968..385c6f9e84 100644 --- a/docker/Dockerfile.draft +++ b/docker/Dockerfile.draft @@ -50,7 +50,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded # # # -FROM icr.io/appcafe/open-liberty:24.0.0.2-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.4-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod index c1ee1538e3..2c3ea41bbe 100644 --- a/docker/Dockerfile.prod +++ b/docker/Dockerfile.prod @@ -68,7 +68,7 @@ COPY --from=docs --chown=1001:0 /temp-docs/docs /target/openliberty-website-1.0- # # # -FROM icr.io/appcafe/open-liberty:24.0.0.2-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.4-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/Dockerfile.staging b/docker/Dockerfile.staging index 5e5619fd4d..d7e0f40a5a 100644 --- a/docker/Dockerfile.staging +++ b/docker/Dockerfile.staging @@ -65,7 +65,7 @@ COPY --from=docs --chown=1001:0 /temp-docs/docs /target/openliberty-website-1.0- # # # -FROM icr.io/appcafe/open-liberty:24.0.0.2-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.4-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/blogs/Dockerfile.blogs.draft b/docker/blogs/Dockerfile.blogs.draft index bf8551cde7..bd629939c6 100644 --- a/docker/blogs/Dockerfile.blogs.draft +++ b/docker/blogs/Dockerfile.blogs.draft @@ -42,7 +42,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded # # # -FROM icr.io/appcafe/open-liberty:24.0.0.2-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.4-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/blogs/Dockerfile.blogs.staging b/docker/blogs/Dockerfile.blogs.staging index 295ad6510a..df5ba1b1f0 100644 --- a/docker/blogs/Dockerfile.blogs.staging +++ b/docker/blogs/Dockerfile.blogs.staging @@ -42,7 +42,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded # # # -FROM icr.io/appcafe/open-liberty:24.0.0.2-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.4-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/certifications/Dockerfile.certifications.draft b/docker/certifications/Dockerfile.certifications.draft index fd0f64c4c5..d483fcd464 100644 --- a/docker/certifications/Dockerfile.certifications.draft +++ b/docker/certifications/Dockerfile.certifications.draft @@ -42,7 +42,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded # # # -FROM icr.io/appcafe/open-liberty:24.0.0.2-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.4-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/certifications/Dockerfile.certifications.staging b/docker/certifications/Dockerfile.certifications.staging index d43fd5e134..d046d2650c 100644 --- a/docker/certifications/Dockerfile.certifications.staging +++ b/docker/certifications/Dockerfile.certifications.staging @@ -42,7 +42,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded # # # -FROM icr.io/appcafe/open-liberty:24.0.0.2-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.4-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/docs/Dockerfile.docs.draft b/docker/docs/Dockerfile.docs.draft index cc2245574b..dde9a7ddd4 100644 --- a/docker/docs/Dockerfile.docs.draft +++ b/docker/docs/Dockerfile.docs.draft @@ -54,7 +54,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded # # # -FROM icr.io/appcafe/open-liberty:24.0.0.2-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.4-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/docs/Dockerfile.docs.staging b/docker/docs/Dockerfile.docs.staging index 7552dae991..20f616a2f9 100644 --- a/docker/docs/Dockerfile.docs.staging +++ b/docker/docs/Dockerfile.docs.staging @@ -54,7 +54,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded # # # -FROM icr.io/appcafe/open-liberty:24.0.0.2-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.4-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/guides/Dockerfile.guides.draft b/docker/guides/Dockerfile.guides.draft index 14d652b76e..a130ada2ff 100644 --- a/docker/guides/Dockerfile.guides.draft +++ b/docker/guides/Dockerfile.guides.draft @@ -42,7 +42,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded # # # -FROM icr.io/appcafe/open-liberty:24.0.0.2-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.4-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/guides/Dockerfile.guides.staging b/docker/guides/Dockerfile.guides.staging index 544ad62b81..e91dbeb7b4 100644 --- a/docker/guides/Dockerfile.guides.staging +++ b/docker/guides/Dockerfile.guides.staging @@ -42,7 +42,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded # # # -FROM icr.io/appcafe/open-liberty:24.0.0.2-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.4-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/ui-only/Dockerfile.ui-only b/docker/ui-only/Dockerfile.ui-only index 9b3ec406f8..cd59094379 100644 --- a/docker/ui-only/Dockerfile.ui-only +++ b/docker/ui-only/Dockerfile.ui-only @@ -41,7 +41,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded # # # -FROM icr.io/appcafe/open-liberty:24.0.0.2-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.4-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml