Skip to content
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.

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

Too many files workaround #3342

Merged
merged 9 commits into from
Aug 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions docker/Dockerfile.demo
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ RUN features.sh

COPY --from=war --chown=1001:0 target/openliberty-website-1.0-SNAPSHOT /config/apps/openliberty.war

COPY --from=docs --chown=1001:0 src/main/content/docs-javadoc/modules /config/apps/openliberty.war/docs

# This script will add the requested server configurations, apply any interim fixes and populate caches to
# optimize runtime
RUN configure.sh
Expand Down
2 changes: 2 additions & 0 deletions docker/Dockerfile.draft
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ RUN features.sh

COPY --from=war --chown=1001:0 target/openliberty-website-1.0-SNAPSHOT /config/apps/openliberty.war

COPY --from=docs --chown=1001:0 src/main/content/docs-javadoc/modules /config/apps/openliberty.war/docs

# This script will add the requested server configurations, apply any interim fixes and populate caches to
# optimize runtime
RUN configure.sh
Expand Down
2 changes: 2 additions & 0 deletions docker/Dockerfile.prod
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ RUN features.sh

COPY --from=war --chown=1001:0 target/openliberty-website-1.0-SNAPSHOT /config/apps/openliberty.war

COPY --from=docs --chown=1001:0 src/main/content/docs-javadoc/modules /config/apps/openliberty.war/docs

# This script will add the requested server configurations, apply any interim fixes and populate caches to
# optimize runtime
ARG VERBOSE=true
Expand Down
2 changes: 2 additions & 0 deletions docker/Dockerfile.staging
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ RUN features.sh

COPY --from=war --chown=1001:0 target/openliberty-website-1.0-SNAPSHOT /config/apps/openliberty.war

COPY --from=docs --chown=1001:0 src/main/content/docs-javadoc/modules /config/apps/openliberty.war/docs

# This script will add the requested server configurations, apply any interim fixes and populate caches to
# optimize runtime
ARG VERBOSE=true
Expand Down
2 changes: 2 additions & 0 deletions docker/docs/Dockerfile.docs.draft
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ RUN features.sh

COPY --from=war --chown=1001:0 target/openliberty-website-1.0-SNAPSHOT /config/apps/openliberty.war

COPY --from=docs --chown=1001:0 src/main/content/docs-javadoc/modules /config/apps/openliberty.war/docs

# This script will add the requested server configurations, apply any interim fixes and populate caches to
# optimize runtime
RUN configure.sh
2 changes: 2 additions & 0 deletions docker/docs/Dockerfile.docs.staging
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ RUN features.sh

COPY --from=war --chown=1001:0 target/openliberty-website-1.0-SNAPSHOT /config/apps/openliberty.war

COPY --from=docs --chown=1001:0 src/main/content/docs-javadoc/modules /config/apps/openliberty.war/docs

# This script will add the requested server configurations, apply any interim fixes and populate caches to
# optimize runtime
RUN configure.sh
8 changes: 0 additions & 8 deletions scripts/build/docs_part_2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@ echo "Total execution time for parsing the features toc: '$(date -u --date @$((
echo "Begin building javadoc content"
$BUILD_SCRIPTS_DIR/javadoc_clone.sh

# Move the javadocs into the web app
echo "Moving javadocs to the jekyll webapp"
timer_start=$(date +%s)
cp -r src/main/content/docs-javadoc/modules target/jekyll-webapp/docs
timer_end=$(date +%s)
echo "Total execution time for copying javadoc to webapp: '$(date -u --date @$(( $timer_end - $timer_start )) +%H:%M:%S)'"


# Special handling for javadocs
$BUILD_SCRIPTS_DIR/javadoc_modify.sh

Expand Down
14 changes: 7 additions & 7 deletions scripts/build/javadoc_modify.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ export -f modifyStylesheetFrameless
export -f modifySearch
export -f modifyRedirect

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 {}' \;
find src/main/content/docs-javadoc/modules -path "*microprofile*/stylesheet.css" -exec bash -c 'modifyStylesheet {}' \;
find src/main/content/docs-javadoc/modules -path "*liberty-*/stylesheet.css" -exec bash -c 'modifyStylesheet {}' \;
find src/main/content/docs-javadoc/modules -path "*io.openliberty*/stylesheet.css" -exec bash -c 'modifyStylesheetFrameless {}' \;
find src/main/content/docs-javadoc/modules -path "*com.ibm.websphere.appserver*/stylesheet.css" -exec bash -c 'modifyStylesheetFrameless {}' \;
find src/main/content/docs-javadoc/modules -name search.js -exec bash -c 'modifySearch {}' \;
find src/main/content/docs-javadoc/modules -name script.js -exec bash -c 'modifyRedirect {}' \;

timer_end=$(date +%s)
echo "Total execution time for modifying the javadoc: '$(date -u --date @$(( $timer_end - $timer_start )) +%H:%M:%S)'"
echo "Total execution time for modifying the javadoc: '$(date -u --date @$(( $timer_end - $timer_start )) +%H:%M:%S)'"
10 changes: 9 additions & 1 deletion src/main/content/_assets/css/post.scss
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ body {
margin-bottom: 8px;
}

#article_body a {
#article_body a{
font-weight: 500;
color: #546FB5;
transition: color .2s;
Expand All @@ -159,7 +159,15 @@ body {
color: #6787D9;
}
}
#article_body a.external {
font-weight: 500;
color: #CC4D19;
transition: color .2s;

&:hover {
color: #F4914D;
}
}
.author_images_container {
display: inline-block;
margin-right: 6px;
Expand Down
11 changes: 11 additions & 0 deletions src/main/content/_assets/js/post.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,15 @@ $(document).ready(function () {
$('.code_block_wrapper').each(function (){
$(this).prepend('<div class="copied_confirmation">Copied to clipboard</div><input type="image" class="copy_to_clipboard" src="/img/guides_copy_button.svg" alt="Copy code block" title="Copy code block"/>');
});

$('#article_body a').each(function() {
var link = $(this);
if (link.prop('hostname') === window.location.hostname) {
return;
} else {
link.addClass('external');
}
});
})


6 changes: 3 additions & 3 deletions src/main/content/antora_ui/src/partials/head-meta.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{{else if page.attributes.description }}
<meta name="description" content="{{page.attributes.description}}">
{{ else }}
<meta name="description" content="Open Liberty documentation and reference materials for developers to build applications and for administrators and operation teams to manage DevOps and deploy workloads to clouds using open cloud-native Java. Covers Open Liberty basics, development, security, deployment, and operations topics, as well as Javadoc for Jakarta EE, MicroProfile and Java EE APIs.">
<meta name="description" content="Open Liberty documentation and reference materials for developers to build applications and for administrators and operation teams to manage DevOps and deploy workloads to clouds by using open cloud-native Java. This content covers Open Liberty basics, development, security, deployment, and operations topics. It also includes Javadoc for Jakarta EE APIs, MicroProfile APIs, Java EE APIs, and Open Liberty APIs and SPIs.">
{{/if}}

<meta name="twitter:card" content="summary" />
Expand All @@ -23,7 +23,7 @@
{{else if page.attributes.description }}
<meta name="twitter:description" content="{{ page.attributes.description }}" />
{{ else }}
<meta name="twitter:description" content="Open Liberty documentation and reference materials for developers to build applications and for administrators and operation teams to manage DevOps and deploy workloads to clouds using open cloud-native Java. Covers Open Liberty basics, development, security, deployment, and operations topics, as well as Javadoc for Jakarta EE, MicroProfile and Java EE APIs." />
<meta name="twitter:description" content="Open Liberty documentation and reference materials for developers to build applications and for administrators and operation teams to manage DevOps and deploy workloads to clouds by using open cloud-native Java. This content covers Open Liberty basics, development, security, deployment, and operations topics. It also includes Javadoc for Jakarta EE APIs, MicroProfile APIs, Java EE APIs, and Open Liberty APIs and SPIs." />
{{/if}}
<meta name="twitter:image" content="https://openliberty.io/img/twitter_card.jpg" />

Expand All @@ -39,7 +39,7 @@
{{else if page.attributes.description }}
<meta property="og:description" content="{{ page.attributes.description }}" />
{{ else }}
<meta property="og:description" content="Open Liberty documentation and reference materials for developers to build applications and for administrators and operation teams to manage DevOps and deploy workloads to clouds using open cloud-native Java. Covers Open Liberty basics, development, security, deployment, and operations topics, as well as Javadoc for Jakarta EE, MicroProfile and Java EE APIs." />
<meta property="og:description" content="Open Liberty documentation and reference materials for developers to build applications and for administrators and operation teams to manage DevOps and deploy workloads to clouds by using open cloud-native Java. This content covers Open Liberty basics, development, security, deployment, and operations topics. It also includes Javadoc for Jakarta EE APIs, MicroProfile APIs, Java EE APIs, and Open Liberty APIs and SPIs." />
{{/if}}
{{#if page.open-graph-image }}
<meta property="og:image" content="{{ page.open-graph-image }}" />
Expand Down
Loading