Merge pull request #3282 from OpenLiberty/staging

Update production
OpenLiberty · Jul 12, 2023 · 9a5a879 · 9a5a879
2 parents c9e0a39 + 0f36ff6
commit 9a5a879
Show file tree

Hide file tree

Showing 20 changed files with 440 additions and 32 deletions.
diff --git a/docker/Dockerfile.demo b/docker/Dockerfile.demo
@@ -44,7 +44,7 @@ COPY .mvn /.mvn
 COPY pom.xml /
 COPY --from=docs --chown=1001:0 /src /src
 COPY --from=docs --chown=1001:0 /target /target
-RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 package
+RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 
 #
 #
@@ -64,3 +64,5 @@ COPY --from=war --chown=1001:0 target/openliberty-website-1.0-SNAPSHOT /config/a
 # This script will add the requested server configurations, apply any interim fixes and populate caches to
 # optimize runtime
 RUN configure.sh
+ARG VERBOSE=true
+ENV OPENJ9_SCC=false
diff --git a/docker/Dockerfile.draft b/docker/Dockerfile.draft
@@ -45,7 +45,7 @@ COPY .mvn /.mvn
 COPY pom.xml /
 COPY --from=docs --chown=1001:0 /src /src
 COPY --from=docs --chown=1001:0 /target /target
-RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 package
+RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 
 #
 #
@@ -65,3 +65,5 @@ COPY --from=war --chown=1001:0 target/openliberty-website-1.0-SNAPSHOT /config/a
 # This script will add the requested server configurations, apply any interim fixes and populate caches to
 # optimize runtime
 RUN configure.sh
+ARG VERBOSE=true
+ENV OPENJ9_SCC=false
diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod
@@ -48,7 +48,7 @@ COPY .mvn /.mvn
 COPY pom.xml /
 COPY --from=docs --chown=1001:0 /src /src
 COPY --from=docs --chown=1001:0 /target /target
-RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 package
+RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 
 #
 #

diff --git a/docker/Dockerfile.staging b/docker/Dockerfile.staging
@@ -45,7 +45,7 @@ COPY .mvn /.mvn
 COPY pom.xml /
 COPY --from=docs --chown=1001:0 /src /src
 COPY --from=docs --chown=1001:0 /target /target
-RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 package
+RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 
 #
 #

diff --git a/docker/blogs/Dockerfile.blogs.draft b/docker/blogs/Dockerfile.blogs.draft
@@ -37,7 +37,7 @@ COPY .mvn /.mvn
 COPY pom.xml /
 COPY --from=jekyll --chown=1001:0 /src /src
 COPY --from=jekyll --chown=1001:0 /target /target
-RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 package
+RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 
 #
 #

diff --git a/docker/blogs/Dockerfile.blogs.staging b/docker/blogs/Dockerfile.blogs.staging
@@ -37,7 +37,7 @@ COPY .mvn /.mvn
 COPY pom.xml /
 COPY --from=jekyll --chown=1001:0 /src /src
 COPY --from=jekyll --chown=1001:0 /target /target
-RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 package
+RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 
 #
 #

diff --git a/docker/certifications/Dockerfile.certifications.draft b/docker/certifications/Dockerfile.certifications.draft
@@ -37,7 +37,7 @@ COPY .mvn /.mvn
 COPY pom.xml /
 COPY --from=jekyll --chown=1001:0 /src /src
 COPY --from=jekyll --chown=1001:0 /target /target
-RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 package
+RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 
 #
 #

diff --git a/docker/certifications/Dockerfile.certifications.staging b/docker/certifications/Dockerfile.certifications.staging
@@ -37,7 +37,7 @@ COPY .mvn /.mvn
 COPY pom.xml /
 COPY --from=jekyll --chown=1001:0 /src /src
 COPY --from=jekyll --chown=1001:0 /target /target
-RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 package
+RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 
 #
 #

diff --git a/docker/docs/Dockerfile.docs.draft b/docker/docs/Dockerfile.docs.draft
@@ -49,7 +49,7 @@ COPY .mvn /.mvn
 COPY pom.xml /
 COPY --from=docs --chown=1001:0 /src /src
 COPY --from=docs --chown=1001:0 /target /target
-RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 package
+RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 
 #
 #

diff --git a/docker/docs/Dockerfile.docs.staging b/docker/docs/Dockerfile.docs.staging
@@ -49,7 +49,7 @@ COPY .mvn /.mvn
 COPY pom.xml /
 COPY --from=docs --chown=1001:0 /src /src
 COPY --from=docs --chown=1001:0 /target /target
-RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 package
+RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 
 #
 #

diff --git a/docker/guides/Dockerfile.guides.draft b/docker/guides/Dockerfile.guides.draft
@@ -37,7 +37,7 @@ COPY .mvn /.mvn
 COPY pom.xml /
 COPY --from=jekyll --chown=1001:0 /src /src
 COPY --from=jekyll --chown=1001:0 /target /target
-RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 package
+RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 
 #
 #

diff --git a/docker/guides/Dockerfile.guides.staging b/docker/guides/Dockerfile.guides.staging
@@ -37,7 +37,7 @@ COPY .mvn /.mvn
 COPY pom.xml /
 COPY --from=jekyll --chown=1001:0 /src /src
 COPY --from=jekyll --chown=1001:0 /target /target
-RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 package
+RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 
 #
 #

diff --git a/docker/ui-only/Dockerfile.ui-only b/docker/ui-only/Dockerfile.ui-only
@@ -36,7 +36,7 @@ COPY .mvn /.mvn
 COPY pom.xml /
 COPY --from=jekyll --chown=1001:0 /src /src
 COPY --from=jekyll --chown=1001:0 /target /target
-RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 package
+RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
 
 #
 #

diff --git a/scripts/build/javadoc_modify.sh b/scripts/build/javadoc_modify.sh
@@ -3,6 +3,18 @@ modifyStylesheet () {
     # Append extra javadoc styling located in the css direcctory to the stylesheet.css located in the javadoc subdirectories
     cat src/main/content/antora_ui/src/css/javadoc-extended-stylesheet.css >> "$1"
 
+    # insert extra import to the beginning of the file
+    sed '1 i\
+    @import url("https://fonts.googleapis.com/css?family=Asap:300,400,500");
+    ' "$1" > newstylesheet.css
+
+    mv newstylesheet.css "$1"
+}
+
+modifyStylesheetFrameless () {
+    # Append extra javadoc styling located in the css direcctory to the stylesheet.css located in the javadoc api/spi subdirectories
+    cat src/main/content/antora_ui/src/css/javadoc-extended-stylesheet-frameless.css >> "$1"
+
     # insert extra import to the beginning of the file
     sed '1 i\
     @import url("https://fonts.googleapis.com/css?family=Asap:300,400,500");
@@ -25,10 +37,14 @@ modifyRedirect () {
 }
 
 export -f modifyStylesheet
+export -f modifyStylesheetFrameless
 export -f modifySearch
 export -f modifyRedirect
 
-find target/jekyll-webapp/docs -name stylesheet.css -exec bash -c 'modifyStylesheet {}' \;
+find target/jekyll-webapp/docs -path "*microprofile*/stylesheet.css" -exec bash -c 'modifyStylesheet {}' \;
+find target/jekyll-webapp/docs -path "*liberty-*/stylesheet.css" -exec bash -c 'modifyStylesheet {}' \;
+find target/jekyll-webapp/docs -path "*io.openliberty*/stylesheet.css" -exec bash -c 'modifyStylesheetFrameless {}' \;
+find target/jekyll-webapp/docs -path "*com.ibm.websphere.appserver*/stylesheet.css" -exec bash -c 'modifyStylesheetFrameless {}' \;
 find target/jekyll-webapp/docs -name search.js  -exec bash -c 'modifySearch {}' \;
 find target/jekyll-webapp/docs -name script.js  -exec bash -c 'modifyRedirect {}' \;
 

diff --git a/src/main/content/_assets/css/blog.scss b/src/main/content/_assets/css/blog.scss
@@ -394,15 +394,22 @@ html {
     }
 }
 
+.blog_post_title{
+    &:hover{
+        .blog_post_title_link{
+                color: #3F4659;
+        }
+        .continued_text{
+                color: #E57000;
+        }
+    }
+}
+
 .blog_post_title_link, #final_post_title {
     font-family: BunueloLight;
     font-size: 35px;
     color: #5E6B8D;
     transition: color .2s;
-
-    &:hover {
-        color: #3F4659;
-    }
 }
 
 .continued_text {