diff --git a/docker/Dockerfile.demo b/docker/Dockerfile.demo index ad54e5e6a..75b8a2718 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:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:25.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 460f55474..cf980fcfe 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:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:25.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 27273469d..ed6a6008a 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:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:25.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 b8cae4821..55bf20d0e 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:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:25.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 922e2ad3f..a978894db 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:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:25.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 a752ee19c..97f81c645 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:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:25.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 ee252110f..01f9038b4 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:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:25.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 6fb7f7580..0dafc7fa2 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:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:25.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 543cf4de6..d89f06598 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:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:25.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 b3a2c9324..b1032d160 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:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:25.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 ecdd51df9..2b61004a6 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:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:25.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 3c71ae305..24414b18f 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:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:25.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 62df3643e..41fb160d4 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:25.0.0.3-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:25.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/scripts/build/antora_build_docs.sh b/scripts/build/antora_build_docs.sh index b5a12d813..deae01d75 100755 --- a/scripts/build/antora_build_docs.sh +++ b/scripts/build/antora_build_docs.sh @@ -2,10 +2,4 @@ echo "Using the Antora playbook to generate what content to display for docs" echo "npm analysis antora_build" npm ls -g --depth=0 -if [ "$PROD_SITE" = true ] - then - # Enable google analytics in docs - antora --fetch --stacktrace --key google-analytics=G-PXYTWCYE18 src/main/content/docs/antora-playbook.yml - else - antora --fetch --stacktrace src/main/content/docs/antora-playbook.yml -fi +antora --fetch --stacktrace src/main/content/docs/antora-playbook.yml diff --git a/scripts/build/jekyll.sh b/scripts/build/jekyll.sh index e388831ac..6aaed7dee 100755 --- a/scripts/build/jekyll.sh +++ b/scripts/build/jekyll.sh @@ -80,7 +80,7 @@ mkdir -p target/jekyll-webapp # Enable google analytics if ga is true if [ "$PROD_SITE" = true ] then - jekyll build --source src/main/content --config src/main/content/_config.yml,src/main/content/_google_analytics.yml --destination target/jekyll-webapp + jekyll build --source src/main/content --config src/main/content/_config.yml --destination target/jekyll-webapp else # Set the --future flag to show blogs with date timestamps in the future jekyll build --future --source src/main/content --config src/main/content/_config.yml --destination target/jekyll-webapp diff --git a/src/main/content/_assets/css/openliberty.scss b/src/main/content/_assets/css/openliberty.scss index 76117a788..d18bd4240 100644 --- a/src/main/content/_assets/css/openliberty.scss +++ b/src/main/content/_assets/css/openliberty.scss @@ -547,6 +547,10 @@ footer { color: #6F7878; } + #footer_copyright{ + margin-bottom: 0; + } + .vertical_bar { margin: 0 4px; } @@ -622,19 +626,15 @@ footer { #teconsent { - height: 40px; - background-color: rgb(255, 255, 255); - z-index: 2147483647; - bottom: 0px; - right: 0px; - margin: 0px; - padding: 0px 16px; - line-height: 40px; vertical-align: middle; - box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 10px 3px; float: right; - margin-bottom: 10px; - margin-left: 10px; + display:contents !important; + a{ + font-size: 11px; + color: #6F7878; + display: inline-block; + line-height: 1.5; + } } @@ -783,4 +783,4 @@ code .conum[data-value]+b { opacity: 1; } } -} +} \ No newline at end of file diff --git a/src/main/content/_google_analytics.yml b/src/main/content/_google_analytics.yml deleted file mode 100644 index fe71b0ee9..000000000 --- a/src/main/content/_google_analytics.yml +++ /dev/null @@ -1 +0,0 @@ -google_tag_manager: G-PXYTWCYE18 \ No newline at end of file diff --git a/src/main/content/_i18n/en.yml b/src/main/content/_i18n/en.yml index f66cfc4be..627f429ee 100644 --- a/src/main/content/_i18n/en.yml +++ b/src/main/content/_i18n/en.yml @@ -29,7 +29,7 @@ pages: support: Support blog: Blog footer: - copyright: Copyright IBM Corp. 2017, 2024 + copyright: Copyright IBM Corp. 2017, 2025 privacy_policy: Privacy policy license: License logos: Logos diff --git a/src/main/content/_i18n/ja.yml b/src/main/content/_i18n/ja.yml index 339859794..515de22dd 100644 --- a/src/main/content/_i18n/ja.yml +++ b/src/main/content/_i18n/ja.yml @@ -29,7 +29,7 @@ pages: support: サポート blog: ブログ footer: - copyright: Copyright IBM Corp. 2017, 2024 + copyright: Copyright IBM Corp. 2017, 2025 privacy_policy: プライバシー・ポリシー license: ライセンス logos: ロゴ diff --git a/src/main/content/_i18n/zh-Hans.yml b/src/main/content/_i18n/zh-Hans.yml index f7548a009..3a015ea40 100644 --- a/src/main/content/_i18n/zh-Hans.yml +++ b/src/main/content/_i18n/zh-Hans.yml @@ -29,7 +29,7 @@ pages: support: 支持 blog: 博客 footer: - copyright: Copyright IBM Corp. 2017, 2024 + copyright: Copyright IBM Corp. 2017, 2025 privacy_policy: 隐私策略 license: 许可证 logos: 洛戈斯 diff --git a/src/main/content/_includes/footer.html b/src/main/content/_includes/footer.html index da63b7327..82a2ce466 100644 --- a/src/main/content/_includes/footer.html +++ b/src/main/content/_includes/footer.html @@ -29,6 +29,8 @@ {% t footer.license %}

|

{% t footer.logos %} +

|

+