1.7

Dockerfile

@@ -1,11 +1,10 @@
 FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi
-#FROM harbor-dev.alldcs.nl/allard/openliberty-java17
 
 ARG VERSION=1.0
 ARG REVISION=SNAPSHOT
 
 LABEL \
-  org.opencontainers.image.authors="Your Name" \
+  org.opencontainers.image.authors="Allard Krings" \
   org.opencontainers.image.vendor="IBM" \
   org.opencontainers.image.url="local" \
   org.opencontainers.image.source="https://github.com/OpenLiberty/guide-getting-started" \

buildah.yaml

@@ -0,0 +1,128 @@
+apiVersion: tekton.dev/v1
+kind: Task
+metadata:
+  name: buildah
+  namespace: default
+spec:
+  description: |-
+    Buildah task builds source into a container image and then pushes it to a container registry.
+    Buildah Task builds source into a container image using Project Atomic's Buildah build tool.It uses Buildah's support for building from Dockerfiles, using its buildah bud command.This command executes the directives in the Dockerfile to assemble a container image, then pushes that image to a container registry.
+  params:
+  - description: Reference of the image buildah will produce.
+    name: IMAGE
+    type: string
+  - default: quay.io/buildah/stable:v1
+    description: The location of the buildah builder image.
+    name: BUILDER_IMAGE
+    type: string
+  - default: overlay
+    description: Set buildah storage driver
+    name: STORAGE_DRIVER
+    type: string
+  - default: ./Dockerfile
+    description: Path to the Dockerfile to build.
+    name: DOCKERFILE
+    type: string
+  - default: .
+    description: Path to the directory to use as context.
+    name: CONTEXT
+    type: string
+  - default: "true"
+    description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS
+      registry)
+    name: TLSVERIFY
+    type: string
+  - default: oci
+    description: The format of the built container, oci or docker
+    name: FORMAT
+    type: string
+  - default: ""
+    description: Extra parameters passed for the build command when building images.
+      WARNING - must be sanitized to avoid command injection
+    name: BUILD_EXTRA_ARGS
+    type: string
+  - default: ""
+    description: Extra parameters passed for the push command when pushing images.
+      WARNING - must be sanitized to avoid command injection
+    name: PUSH_EXTRA_ARGS
+    type: string
+  - default: "false"
+    description: Skip pushing the built image
+    name: SKIP_PUSH
+    type: string
+  - default:
+    - ""
+    description: Dockerfile build arguments, array of key=value
+    name: BUILD_ARGS
+    type: array
+  results:
+  - description: Digest of the image just built.
+    name: IMAGE_DIGEST
+    type: string
+  - description: Image repository where the built image would be pushed to
+    name: IMAGE_URL
+    type: string
+  steps:
+  - args:
+    - $(params.BUILD_ARGS[*])
+    computeResources: {}
+    env:
+    - name: PARAM_IMAGE
+      value: $(params.IMAGE)
+    - name: PARAM_STORAGE_DRIVER
+      value: $(params.STORAGE_DRIVER)
+    - name: PARAM_DOCKERFILE
+      value: $(params.DOCKERFILE)
+    - name: PARAM_CONTEXT
+      value: $(params.CONTEXT)
+    - name: PARAM_TLSVERIFY
+      value: $(params.TLSVERIFY)
+    - name: PARAM_FORMAT
+      value: $(params.FORMAT)
+    - name: PARAM_BUILD_EXTRA_ARGS
+      value: $(params.BUILD_EXTRA_ARGS)
+    - name: PARAM_PUSH_EXTRA_ARGS
+      value: $(params.PUSH_EXTRA_ARGS)
+    - name: PARAM_SKIP_PUSH
+      value: $(params.SKIP_PUSH)
+    image: $(params.BUILDER_IMAGE)
+    name: build-and-push
+    script: |
+      BUILD_ARGS=()
+      for buildarg in "$@"
+      do
+        BUILD_ARGS+=("--build-arg=$buildarg")
+      done
+      [ "$(workspaces.sslcertdir.bound)" = "true" ] && CERT_DIR_FLAG="--cert-dir=$(workspaces.sslcertdir.path)"
+      [ "$(workspaces.dockerconfig.bound)" = "true" ] && DOCKER_CONFIG="$(workspaces.dockerconfig.path)" && export DOCKER_CONFIG
+      # build the image (CERT_DIR_FLAG should be omitted if empty and BUILD_EXTRA_ARGS can contain multiple args)
+      # shellcheck disable=SC2046,SC2086
+      buildah ${CERT_DIR_FLAG} "--storage-driver=${PARAM_STORAGE_DRIVER}" bud "${BUILD_ARGS[@]}" ${PARAM_BUILD_EXTRA_ARGS} \
+        "--format=${PARAM_FORMAT}" "--tls-verify=${PARAM_TLSVERIFY}" \
+        -f "${PARAM_DOCKERFILE}" -t "${PARAM_IMAGE}" "${PARAM_CONTEXT}"
+      [ "${PARAM_SKIP_PUSH}" = "true" ] && echo "Push skipped" && exit 0
+      # push the image (CERT_DIR_FLAG should be omitted if empty and PUSH_EXTRA_ARGS can contain multiple args)
+      # shellcheck disable=SC2046,SC2086
+      buildah ${CERT_DIR_FLAG} "--storage-driver=${PARAM_STORAGE_DRIVER}" push \
+        "--tls-verify=${PARAM_TLSVERIFY}" --digestfile /tmp/image-digest ${PARAM_PUSH_EXTRA_ARGS} \
+        "${PARAM_IMAGE}" "docker://${PARAM_IMAGE}"
+      tee "$(results.IMAGE_DIGEST.path)" < /tmp/image-digest
+      printf '%s' "${PARAM_IMAGE}" | tee "$(results.IMAGE_URL.path)"
+    securityContext:
+      privileged: true
+    volumeMounts:
+    - mountPath: /var/lib/containers
+      name: varlibcontainers
+    workingDir: $(workspaces.source.path)
+  volumes:
+  - emptyDir: {}
+    name: varlibcontainers
+  workspaces:
+  - name: source
+  - name: sslcertdir
+    optional: true
+  - description: An optional workspace that allows providing a .docker/config.json
+      file for Buildah to access the container registry. The file should be placed
+      at the root of the Workspace with name config.json.
+    name: dockerconfig
+    optional: true

src/main/webapp/css/main.css

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2018 IBM Corporation and others.
+* Copyright (c) 2018, 2024 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -8,22 +8,20 @@
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
-@import url("https://fonts.googleapis.com/css?family=Asap:300,400,500");
-
 @font-face {
   font-family: BunueloLight;
-    src: url("/fonts/BunueloCleanPro-Light.woff");
+  src: url("/fonts/BunueloCleanPro-Light.otf");
 }
 
 @font-face {
   font-family: BunueloSemiBold;
-    src: url("/fonts/BunueloCleanPro-SemiBold.woff");
+  src: url("/fonts/BunueloCleanPro-SemiBold.otf");
 }
 
-body{
+body {
-    font-family:Asap;
+  font-family: BunueloSemiBold;
   font-size: 16px;
-    color:#24243b;
+  color: #24243b;
   background-color: white;
   margin: 0px;
 }
@@ -33,8 +31,8 @@ section {
   padding-left: 8%;
   padding-right: 8%;
   /* font-weight: 400; */
-    letter-spacing:0;
+  letter-spacing: 0;
-    text-align:left;
+  text-align: left;
 }
 
 .line {
@@ -44,7 +42,7 @@ section {
 }
 
 .headerImage {
-    background-image: url(/img/header_ufo.png);
+  background-image: url("/img/header_ufo.png");
   background-repeat: no-repeat;
   background-position: top 20px right 15px;
   height: 103px;
@@ -61,11 +59,11 @@ p {
   margin-top: 0px;
 }
 h1 {
-    font-family:BunueloSemiBold;
+  font-family: BunueloSemiBold;
   font-size: 40px;
   font-weight: 400;
-    letter-spacing:0;
+  letter-spacing: 0;
-    text-align:left;
+  text-align: left;
 }
 h2 {
   font-size: 24px;
@@ -79,7 +77,7 @@ a {
 }
 
 #appIntro {
-    background-image:linear-gradient(#141427 0%, #2c2e50 100%);
+  background-image: linear-gradient(#141427 0%, #2c2e50 100%);
   background-size: 100% calc(100% - 70px);
   background-repeat: no-repeat;
 }
@@ -90,14 +88,14 @@ a {
 }
 
 #appTitle {
-    font-family:BunueloLight;
+  font-family: BunueloLight;
-    font-size:55px;
+  font-size: 55px;
 }
 
 .headerRow {
   height: 100px;
-    position:relative;
+  position: relative;
-    z-index:2;
+  z-index: 2;
   box-shadow: 0 2px 4px 0 rgba(0,0,0,0.50);
 }
 .headerRow > div {
@@ -150,7 +148,7 @@ a {
   background-color: #E8EAEF;
 }
 .headerIcon img {
-    display:block;
+  display: Block;
   margin:auto;
   margin-top: 20px;
 }
@@ -167,7 +165,7 @@ a {
 
 .headerTitle {
   background-color: white;
-    color:#5d6a8e;
+  color: #5d6a8e;
   letter-spacing:0;
   text-align:left;
   padding-left: 40px;
@@ -190,7 +188,7 @@ a {
 
 .headerTitle > h2 {
   font-family: BunueloLight;
-    font-size:40px;
+  font-size: 40px;
   margin: 0;
 }
 
@@ -222,11 +220,11 @@ a {
 }
 
 button {
-    border-radius:100px;
+  border-radius: 100px;
-    height:44px;
+  height: 44px;
-    color:#24253a;
+  color: #24253a;
-    text-align:center;
+  text-align: center;
-    font-family: Asap;
+  font-family: BunueloSemiBold;
   margin-top: 25px;
   margin-bottom: 70px;
   cursor: pointer;
@@ -235,24 +233,24 @@ button {
 
 button a {
   text-decoration: none;
-    color:#F4914D;
+  color: #F4914D;
 }
 
 #guidesButton {
-    background-color:#abd155;
+  background-color: #abd155;
-    width:269px;
+  width: 269px;
   font-weight: 500;
-    font-size:16px;
+  font-size: 16px;
   transition: background-color .2s;
 }
 #guidesButton:hover {
   background-color: #C7EE63;
 }
 #mpGuidesButton {
-    border:2px solid #f4914d8c;
+  border: 2px solid #f4914d8c;
-    border-radius:100px;
+  border-radius: 100px;
-    font-size:20px;
+  font-size: 20px;
-    letter-spacing:0;
+  letter-spacing: 0;
   padding-left: 40px;
   padding-right: 40px;
   background-color: white;
@@ -264,7 +262,7 @@ button a {
 }
 
 section#openLibertyAndMp {
-    background:#f4f4f5;
+  background: #f4f4f5;
   background-size: 100% calc(100% - 70px);
   background-repeat: no-repeat;
 }
@@ -297,7 +295,7 @@ section#openLibertyAndMp {
 
 #serviceStatus {
   font-size: 50px;
-    font-family:BunueloLight;
+  font-family: BunueloLight;
   margin-top: 30px;
 }
 
@@ -378,12 +376,12 @@ td {
 }
 
 #learnMore > h2 {
-    color:#5e6b8d;
+  color: #5e6b8d;
 }
 
 .bodyFooter {
   padding: 5px 8%;
-  background-image: url(/img/footer_main.png);
+  background-image: url("/img/footer_main.png");
   background-repeat: no-repeat;
   background-position: top 20px right 110px;
   margin-bottom: 40px;
@@ -392,7 +390,7 @@ td {
 }
 
 .bodyFooterLink {
-  font-family: Asap;
+  font-family: BunueloSemiBold;
   font-weight: 300;
   font-size: 14px;
   letter-spacing: 0;

src/main/webapp/index.html

@@ -1,20 +1,7 @@
-<!--
+<!DOCTYPE html>
-  Copyright (c) 2016, 2023 IBM Corp.
+<html lang="en">
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<html>
     <head>
+        <title>olproperties</title>
         <script src="js/mpData.js"></script>
         <link href="https://fonts.googleapis.com/css?family=Asap" rel="stylesheet">
         <link rel="stylesheet" href="css/main.css">
@@ -22,7 +9,7 @@
     <body>
         <section id="appIntro">
             <div id="titleSection">
-                <h1 id="appTitle">Java-PitStop Openliberty/Java17 voorbeeld 3.0</h1>
+                <h1 id="appTitle">Java-PitStop Openliberty/Java17 voorbeeld 1.7</h1>
                 <div class="line"></div>
                 <div class="headerImage"></div>
                 <h2>Open Liberty Java17 applicatie op Container Hosting Platform!</h2>
@@ -104,16 +91,16 @@
 
         </section>
         <section id="whereToNext">
-            <h2>Where to next, captain?</h2>
+            <h2>Waar wil je nu naartoe?</h2>
-            <h4>Set course for the Open Liberty guides!</h4>
+            <h4>Ga naar Open Liberty tutorials!</h4>
-            <p>All of the info you need to continue your journey is here, laid out in easy to follow steps and examples. Searching our current selection makes it easy to find the guide that will help make your next project a reality.</p>
+            <p>Alle verdere informatie, voorbeelden en hulp vind je hier:</p>
-            <a href="https://openliberty.io/guides/"><button id="guidesButton">View all Open Liberty guides</button></a>
+            <a href="https://openliberty.io/guides/"><button id="guidesButton">Open Liberty Tutorials</button></a>
         </section>
 
         <script>
             displaySystemProperties(); // this calls displayMetrics() because it is a dependency
             displayHealth();
-            //displayConfigProperties();
+            displayConfigProperties();
         </script>
     </body>
 
@@ -124,7 +111,7 @@
           <a href="https://github.com/OpenLiberty">GitHub</a>
           <a href="https://openliberty.io/">openliberty.io</a>
         </div>
-        <p id="footerText">an IBM open source project</p>
+        <p id="footerText">Een open-source project van Allard</p>
-        <p id="footerCopyright">&copy;Copyright IBM Corp. 2018, 2023</p>
+        <p id="footerCopyright">&copy;Copyright AllardDCS 2025</p>
     </footer>
 </html>

src/main/webapp/js/mpData.js

@@ -13,7 +13,7 @@ function displayMetrics() {
 }
 
 function getSystemMetrics() {
-    var url = "https://olproperties-dev.alldcs.nl/metrics";
+    var url = "https://olproperties-dev.allarddcs.nl/metrics";
     var req = new XMLHttpRequest();
 
     var metricToDisplay = {};
@@ -86,7 +86,7 @@ function displaySystemProperties() {
 
 function getSystemPropertiesRequest() {
     var propToDisplay = ["java.vendor", "java.version", "user.name", "os.name", "wlp.install.dir", "wlp.server.name" ];
-    var url = "https://olproperties-dev.alldcs.nl/system/properties";
+    var url = "https://olproperties-dev.allarddcs.nl/system/properties";
     var req = new XMLHttpRequest();
     var table = document.getElementById("systemPropertiesTable");
     // Create the callback:
@@ -131,7 +131,7 @@ function displayHealth() {
 }
 
 function getHealth() {
-    var url = "https://olproperties-dev.alldcs.nl/health";
+    var url = "https://olproperties-dev.allarddcs.nl/health";
     var req = new XMLHttpRequest();
 
     var healthBox = document.getElementById("healthBox");
@@ -173,7 +173,7 @@ function displayConfigProperties() {
 }
 
 function getConfigPropertiesRequest() {
-    var url = "https://olproperties-dev.alldcs.nl/config";
+    var url = "https://olproperties-dev.allarddcs.nl/config";
     var req = new XMLHttpRequest();
 
     var configToDisplay = {};

test.txt

@@ -1 +1 @@
-20240827-3
+20250408-0923