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

Some more fixes related to UBI9 #491

Merged
merged 2 commits into from
Oct 10, 2024
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
6 changes: 3 additions & 3 deletions docs/index.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
= WildFly S2I (Source to Image) builder and runtime images documentation

== WildFly - UBI8 runtime image
== WildFly - UBI9 runtime image

An image containing all you need to run a WildFly Server. This image is to be used in a docker build to install a WildFly server.

Expand All @@ -16,10 +16,10 @@ The example link:https://github.com/wildfly/wildfly-s2i/blob/main/examples/docke

=== Image API

When running a WildFly server inside the WildFly S2i runtime, you can use these link:https://github.com/jboss-container-images/openjdk/blob/ubi8/modules/jvm/api/module.yaml[environment variables] to configure the Java VM.
When running a WildFly server inside the WildFly S2i runtime, you can use these link:https://github.com/jboss-container-images/openjdk/blob/ubi9/modules/jvm/module.yaml[environment variables] to configure the Java VM.
The WildFly S2i runtime image is exposing a set of link:https://github.com/wildfly/wildfly-cekit-modules/blob/main/jboss/container/wildfly/run/api/module.yaml[environment variables] to fine tune the server execution.

== WildFly - UBI8 S2I builder image
== WildFly - UBI9 S2I builder image

=== S2I build workflow

Expand Down
15 changes: 8 additions & 7 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="generator" content="Asciidoctor 2.0.20">
<meta name="generator" content="Asciidoctor 2.0.23">
<title>WildFly S2I (Source to Image) builder and runtime images documentation</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
<style>
Expand Down Expand Up @@ -140,7 +140,7 @@
#content::before{content:none}
#header>h1:first-child{color:rgba(0,0,0,.85);margin-top:2.25rem;margin-bottom:0}
#header>h1:first-child+#toc{margin-top:8px;border-top:1px solid #dddddf}
#header>h1:only-child,body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #dddddf;padding-bottom:8px}
#header>h1:only-child{border-bottom:1px solid #dddddf;padding-bottom:8px}
#header .details{border-bottom:1px solid #dddddf;line-height:1.45;padding-top:.25em;padding-bottom:.25em;padding-left:.25em;color:rgba(0,0,0,.6);display:flex;flex-flow:row wrap}
#header .details span:first-child{margin-left:-.125em}
#header .details span.email a{color:rgba(0,0,0,.85)}
Expand All @@ -162,6 +162,7 @@
#toctitle{color:#7a2518;font-size:1.2em}
@media screen and (min-width:768px){#toctitle{font-size:1.375em}
body.toc2{padding-left:15em;padding-right:0}
body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #dddddf;padding-bottom:8px}
#toc.toc2{margin-top:0!important;background:#f8f8f7;position:fixed;width:15em;left:0;top:0;border-right:1px solid #e7e7e9;border-top-width:0!important;border-bottom-width:0!important;z-index:1000;padding:1.25em 1em;height:100%;overflow:auto}
#toc.toc2 #toctitle{margin-top:0;margin-bottom:.8rem;font-size:1.2em}
#toc.toc2>ul{font-size:.9em;margin-bottom:0}
Expand Down Expand Up @@ -327,7 +328,7 @@
a.image object{pointer-events:none}
sup.footnote,sup.footnoteref{font-size:.875em;position:static;vertical-align:super}
sup.footnote a,sup.footnoteref a{text-decoration:none}
sup.footnote a:active,sup.footnoteref a:active{text-decoration:underline}
sup.footnote a:active,sup.footnoteref a:active,#footnotes .footnote a:first-of-type:active{text-decoration:underline}
#footnotes{padding-top:.75em;padding-bottom:.75em;margin-bottom:.625em}
#footnotes hr{width:20%;min-width:6.25em;margin:-.25em 0 .75em;border-width:1px 0 0}
#footnotes .footnote{padding:0 .375em 0 .225em;line-height:1.3334;font-size:.875em;margin-left:1.2em;margin-bottom:.2em}
Expand Down Expand Up @@ -439,7 +440,7 @@ <h1>WildFly S2I (Source to Image) builder and runtime images documentation</h1>
</div>
<div id="content">
<div class="sect1">
<h2 id="_wildfly_ubi8_runtime_image">WildFly - UBI8 runtime image</h2>
<h2 id="_wildfly_ubi9_runtime_image">WildFly - UBI9 runtime image</h2>
<div class="sectionbody">
<div class="paragraph">
<p>An image containing all you need to run a WildFly Server. This image is to be used in a docker build to install a WildFly server.</p>
Expand All @@ -466,14 +467,14 @@ <h2 id="_wildfly_ubi8_runtime_image">WildFly - UBI8 runtime image</h2>
<div class="sect2">
<h3 id="_image_api">Image API</h3>
<div class="paragraph">
<p>When running a WildFly server inside the WildFly S2i runtime, you can use these <a href="https://github.com/jboss-container-images/openjdk/blob/ubi8/modules/jvm/api/module.yaml">environment variables</a> to configure the Java VM.
<p>When running a WildFly server inside the WildFly S2i runtime, you can use these <a href="https://github.com/jboss-container-images/openjdk/blob/ubi9/modules/jvm/module.yaml">environment variables</a> to configure the Java VM.
The WildFly S2i runtime image is exposing a set of <a href="https://github.com/wildfly/wildfly-cekit-modules/blob/main/jboss/container/wildfly/run/api/module.yaml">environment variables</a> to fine tune the server execution.</p>
</div>
</div>
</div>
</div>
<div class="sect1">
<h2 id="_wildfly_ubi8_s2i_builder_image">WildFly - UBI8 S2I builder image</h2>
<h2 id="_wildfly_ubi9_s2i_builder_image">WildFly - UBI9 S2I builder image</h2>
<div class="sectionbody">
<div class="sect2">
<h3 id="_s2i_build_workflow">S2I build workflow</h3>
Expand Down Expand Up @@ -635,7 +636,7 @@ <h2 id="_using_image_streams_with_helm_chart_for_wildfly">Using image streams wi
</div>
<div id="footer">
<div id="footer-text">
Last updated 2023-11-21 10:05:21 +0100
Last updated 2024-10-10 11:53:36 +0200
</div>
</div>
</body>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

if [ "${SCRIPT_DEBUG}" = "true" ] ; then
if [ "${LOGGING_SCRIPT_DEBUG}" = "true" ] ; then
set -x
echo "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
fi
Expand Down
2 changes: 1 addition & 1 deletion wildfly-builder-image/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ labels:
- name: "org.jboss.deployments-dir"
value: "/opt/server/standalone/deployments"
envs:
- name: SCRIPT_DEBUG
- name: LOGGING_SCRIPT_DEBUG
description: If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed.
example: "true"
- name: IMAGE_NAME
Expand Down
2 changes: 1 addition & 1 deletion wildfly-runtime-image/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ labels:
- name: "org.jboss.deployments-dir"
value: "/opt/server/standalone/deployments"
envs:
- name: SCRIPT_DEBUG
- name: LOGGING_SCRIPT_DEBUG
description: If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed.
example: "true"
- name: IMAGE_NAME
Expand Down
Loading