Merge pull request #3729 from OpenLiberty/staging

Update prod
OpenLiberty · May 10, 2024 · eee0dd9 · eee0dd9
2 parents 5aa6d50 + 883e75e
commit eee0dd9
Show file tree

Hide file tree

Showing 32 changed files with 34 additions and 191 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -246,9 +245,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
@@ -1,7 +1,6 @@
 global:
   openliberty: Open Liberty
   ol_logo_subtitile: An IBM Open Source Project
-  twitter: Twitter
   learnmore: Learn more
   readmore: 詳細はこちら
   and: and
@@ -246,9 +245,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
@@ -1,7 +1,6 @@
 global:
   openliberty: Open Liberty
   ol_logo_subtitile: IBM 开放式源代码项目
-  twitter: Twitter
   learnmore: Learn more
   readmore: 阅读更多
   and: and
@@ -245,9 +244,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/_includes/head.html b/src/main/content/_includes/head.html
@@ -64,10 +64,6 @@
   <link rel="alternate" type="application/rss+xml" title="{{ site.title | escape }}" href="{{ "/feed.xml" | relative_url }}">
   <link href="https://fonts.googleapis.com/css?family=Asap:400,500" rel="stylesheet">
 
-  <meta name="twitter:card" content="summary" />
-  <meta name="twitter:site" content="@OpenLibertyIO" />
-  <meta name="twitter:title" content="{% if page.seo-title %}{{ page.seo-title }}{% else %}{{site.title}}{% endif %}" />
-  <meta name="twitter:description" content="{{ description }}" />
 
   <meta property='og:title' content="{% if page.seo-title %}{{ page.seo-title }}{% else %}{{site.title}}{% endif %}" />
   <meta property='og:image' content="{% if page.open-graph-image %}{{page.open-graph-image}}{% else %}{{default_image}}{% endif %}" />