Skip to content

Commit

Permalink
Merge pull request #44 from klaros-testmanagement/development/image-b…
Browse files Browse the repository at this point in the history
…uilder

Update Klaros to version 5.0.8.
  • Loading branch information
stolp authored Feb 27, 2021
2 parents 1036755 + 479e39e commit 01c2641
Show file tree
Hide file tree
Showing 16 changed files with 20 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .html/Documentation-German.html
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ <h1>Klaros-Testmanagement Docker-Integration</h1>
<div id="preamble">
<div class="sectionbody">
<div class="paragraph">
<p><span class="image"><a class="image" href="https://github.com/klaros-testmanagement/klaros-docker/releases"><img src="https://img.shields.io/badge/Version-5.0.7-green.svg" alt="Version 5.0.7 green"></a></span>
<p><span class="image"><a class="image" href="https://github.com/klaros-testmanagement/klaros-docker/releases"><img src="https://img.shields.io/badge/Version-5.0.8-green.svg" alt="Version 5.0.8 green"></a></span>
<span class="image"><a class="image" href="https://github.com/klaros-testmanagement/klaros-docker/blob/master/LICENSE"><img src="https://img.shields.io/badge/License-MIT-green" alt="License MIT green"></a></span>
<span class="image"><a class="image" href="https://www.klaros-testmanagement.com/en_US/download"><img src="https://img.shields.io/badge/Community%20Edition-FREE-green" alt="Community%20Edition FREE green"></a></span>
<span class="image right"><a class="image" href="https://twitter.com/intent/follow?screen_name=Klaros_TM"><img src="https://img.shields.io/twitter/follow/Klaros_TM?style=social" alt="Klaros TM?style=social"></a></span></p>
Expand Down
2 changes: 1 addition & 1 deletion .html/Documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ <h1>Klaros Test Management Docker-Integration</h1>
<div id="preamble">
<div class="sectionbody">
<div class="paragraph">
<p><span class="image"><a class="image" href="https://github.com/klaros-testmanagement/klaros-docker/releases"><img src="https://img.shields.io/badge/Version-5.0.7-green.svg" alt="Version 5.0.7 green"></a></span>
<p><span class="image"><a class="image" href="https://github.com/klaros-testmanagement/klaros-docker/releases"><img src="https://img.shields.io/badge/Version-5.0.8-green.svg" alt="Version 5.0.8 green"></a></span>
<span class="image"><a class="image" href="https://github.com/klaros-testmanagement/klaros-docker/blob/master/LICENSE"><img src="https://img.shields.io/badge/License-MIT-green" alt="License MIT green"></a></span>
<span class="image"><a class="image" href="https://www.klaros-testmanagement.com/en_US/download"><img src="https://img.shields.io/badge/Community%20Edition-FREE-green" alt="Community%20Edition FREE green"></a></span>
<span class="image right"><a class="image" href="https://twitter.com/intent/follow?screen_name=Klaros_TM"><img src="https://img.shields.io/twitter/follow/Klaros_TM?style=social" alt="Klaros TM?style=social"></a></span></p>
Expand Down
2 changes: 1 addition & 1 deletion .html/README-German.html
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ <h1>Klaros-Testmanagement Docker-Integration</h1>
<div id="preamble">
<div class="sectionbody">
<div class="paragraph">
<p><span class="image"><a class="image" href="https://github.com/klaros-testmanagement/klaros-docker/releases"><img src="https://img.shields.io/badge/Version-5.0.7-green.svg" alt="Version 5.0.7 green"></a></span>
<p><span class="image"><a class="image" href="https://github.com/klaros-testmanagement/klaros-docker/releases"><img src="https://img.shields.io/badge/Version-5.0.8-green.svg" alt="Version 5.0.8 green"></a></span>
<span class="image"><a class="image" href="https://github.com/klaros-testmanagement/klaros-docker/blob/master/LICENSE"><img src="https://img.shields.io/badge/License-MIT-green" alt="License MIT green"></a></span>
<span class="image"><a class="image" href="https://www.klaros-testmanagement.com/en_US/download"><img src="https://img.shields.io/badge/Community%20Edition-FREE-green" alt="Community%20Edition FREE green"></a></span>
<span class="image right"><a class="image" href="https://twitter.com/intent/follow?screen_name=Klaros_TM"><img src="https://img.shields.io/twitter/follow/Klaros_TM?style=social" alt="Klaros TM?style=social"></a></span></p>
Expand Down
2 changes: 1 addition & 1 deletion .html/README.html
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ <h1>Klaros Test Management Docker-Integration</h1>
<div id="preamble">
<div class="sectionbody">
<div class="paragraph">
<p><span class="image"><a class="image" href="https://github.com/klaros-testmanagement/klaros-docker/releases"><img src="https://img.shields.io/badge/Version-5.0.7-green.svg" alt="Version 5.0.7 green"></a></span>
<p><span class="image"><a class="image" href="https://github.com/klaros-testmanagement/klaros-docker/releases"><img src="https://img.shields.io/badge/Version-5.0.8-green.svg" alt="Version 5.0.8 green"></a></span>
<span class="image"><a class="image" href="https://github.com/klaros-testmanagement/klaros-docker/blob/master/LICENSE"><img src="https://img.shields.io/badge/License-MIT-green" alt="License MIT green"></a></span>
<span class="image"><a class="image" href="https://www.klaros-testmanagement.com/en_US/download"><img src="https://img.shields.io/badge/Community%20Edition-FREE-green" alt="Community%20Edition FREE green"></a></span>
<span class="image right"><a class="image" href="https://twitter.com/intent/follow?screen_name=Klaros_TM"><img src="https://img.shields.io/twitter/follow/Klaros_TM?style=social" alt="Klaros TM?style=social"></a></span></p>
Expand Down
2 changes: 1 addition & 1 deletion ApacheDerby/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ ENV TOMCAT_SERVER_PORT ${TOMCAT_SERVER_PORT:-18005}
ENV TOMCAT_AJP_PORT ${TOMCAT_AJP_PORT:-18009}

# Klaros release version, which is used during installation. A list of available releases can be found on the official Klaros Test Management website or on GitHub.
ENV KLAROS_VERSION ${KLAROS_VERSION:-5.0.7}
ENV KLAROS_VERSION ${KLAROS_VERSION:-5.0.8}

ENV KLAROS_HOME /data/klaros-home
ENV CATALINA_BASE /data/catalina-base
Expand Down
2 changes: 1 addition & 1 deletion Documentation-German.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ endif::[]
:sectnums:
:toc-title: Inhaltsverzeichnis

image:https://img.shields.io/badge/Version-5.0.7-green.svg[link="https://github.com/klaros-testmanagement/klaros-docker/releases"]
image:https://img.shields.io/badge/Version-5.0.8-green.svg[link="https://github.com/klaros-testmanagement/klaros-docker/releases"]
image:https://img.shields.io/badge/License-MIT-green[link="https://github.com/klaros-testmanagement/klaros-docker/blob/master/LICENSE"]
image:https://img.shields.io/badge/Community%20Edition-FREE-green[link="https://www.klaros-testmanagement.com/en_US/download"]
image:https://img.shields.io/twitter/follow/Klaros_TM?style=social[float="right", link="https://twitter.com/intent/follow?screen_name=Klaros_TM"]
Expand Down
2 changes: 1 addition & 1 deletion Documentation.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ endif::[]
:toc: macro
:sectnums:

image:https://img.shields.io/badge/Version-5.0.7-green.svg[link="https://github.com/klaros-testmanagement/klaros-docker/releases"]
image:https://img.shields.io/badge/Version-5.0.8-green.svg[link="https://github.com/klaros-testmanagement/klaros-docker/releases"]
image:https://img.shields.io/badge/License-MIT-green[link="https://github.com/klaros-testmanagement/klaros-docker/blob/master/LICENSE"]
image:https://img.shields.io/badge/Community%20Edition-FREE-green[link="https://www.klaros-testmanagement.com/en_US/download"]
image:https://img.shields.io/twitter/follow/Klaros_TM?style=social[float="right", link="https://twitter.com/intent/follow?screen_name=Klaros_TM"]
Expand Down
2 changes: 1 addition & 1 deletion MariaDB/db/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ RUN set -ex; \

# bashbrew-architectures: amd64 arm64v8 ppc64le
ENV MARIADB_MAJOR 10.4
ENV MARIADB_VERSION 1:10.4.17+maria~bionic
ENV MARIADB_VERSION 1:10.4.18+maria~bionic
# release-status:Stable
# (https://downloads.mariadb.org/mariadb/+releases/)

Expand Down
2 changes: 1 addition & 1 deletion MariaDB/klaros/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ENV TOMCAT_SERVER_PORT ${TOMCAT_SERVER_PORT:-18005}
ENV TOMCAT_AJP_PORT ${TOMCAT_AJP_PORT:-18009}

# Klaros release version, which is used during installation. A list of available releases can be found on the official Klaros Test Management website or on GitHub.
ENV KLAROS_VERSION ${KLAROS_VERSION:-5.0.7}
ENV KLAROS_VERSION ${KLAROS_VERSION:-5.0.8}
ENV KLAROS_HOME /data/klaros-home
ENV CATALINA_BASE /data/catalina-base

Expand Down
14 changes: 0 additions & 14 deletions MariaDB/klaros/files/catalina-wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,6 @@ ctrl_c() {
exit 2
}

if [ -d "$CA_DIR_DATA" ]; then
echo "$CA_DIR_DATA exists"
else
echo "creating $CA_DIR_DATA"
mkdir -p $CA_DIR_DATA
fi

if [ -d "$MSQL_DIR_DATA" ]; then
echo "$MSQL_DIR_DATA exists"
else
echo "creating $MSQL_DIR_DATA"
mkdir -p $MSQL_DIR_DATA
fi

if [ -d "$KT_DIR_HOME" ]; then
echo "$KT_DIR_HOME exists"
else
Expand Down
2 changes: 1 addition & 1 deletion Microsoft SQL Server/klaros/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ENV TOMCAT_SERVER_PORT ${TOMCAT_SERVER_PORT:-18005}
ENV TOMCAT_AJP_PORT ${TOMCAT_AJP_PORT:-18009}

# Klaros release version, which is used during installation. A list of available releases can be found on the official Klaros Test Management website or on GitHub.
ENV KLAROS_VERSION ${KLAROS_VERSION:-5.0.7}
ENV KLAROS_VERSION ${KLAROS_VERSION:-5.0.8}
ENV KLAROS_HOME /data/klaros-home
ENV CATALINA_BASE /data/catalina-base

Expand Down
2 changes: 1 addition & 1 deletion MySQL/klaros/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ENV TOMCAT_SERVER_PORT ${TOMCAT_SERVER_PORT:-18005}
ENV TOMCAT_AJP_PORT ${TOMCAT_AJP_PORT:-18009}

# Klaros release version, which is used during installation. A list of available releases can be found on the official Klaros Test Management website or on GitHub.
ENV KLAROS_VERSION ${KLAROS_VERSION:-5.0.7}
ENV KLAROS_VERSION ${KLAROS_VERSION:-5.0.8}
ENV KLAROS_HOME /data/klaros-home
ENV CATALINA_BASE /data/catalina-base

Expand Down
8 changes: 4 additions & 4 deletions MySQL/klaros/files/catalina-wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ ctrl_c() {
exit 2
}

if [ -d "$MSQL_DIR_DATA" ]; then
echo "$MSQL_DIR_DATA exists"
if [ -d "$MYSQL_DIR_DATA" ]; then
echo "$MYSQL_DIR_DATA exists"
else
echo "creating $MSQL_DIR_DATA"
mkdir -p $MSQL_DIR_DATA
echo "creating $MYSQL_DIR_DATA"
mkdir -p $MYSQL_DIR_DATA
fi

if [ -d "$KT_DIR_HOME" ]; then
Expand Down
2 changes: 1 addition & 1 deletion PostgreSQL/klaros/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ENV TOMCAT_SERVER_PORT ${TOMCAT_SERVER_PORT:-18005}
ENV TOMCAT_AJP_PORT ${TOMCAT_AJP_PORT:-18009}

# Klaros release version, which is used during installation. A list of available releases can be found on the official Klaros Test Management website or on GitHub.
ENV KLAROS_VERSION ${KLAROS_VERSION:-5.0.7}
ENV KLAROS_VERSION ${KLAROS_VERSION:-5.0.8}
ENV KLAROS_HOME /data/klaros-home
ENV CATALINA_BASE /data/catalina-base

Expand Down
4 changes: 2 additions & 2 deletions README-German.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ endif::[]
:sectnums:
:toc-title: Inhaltsverzeichnis

image:https://img.shields.io/badge/Version-5.0.7-green.svg[link="https://github.com/klaros-testmanagement/klaros-docker/releases"]
image:https://img.shields.io/badge/Version-5.0.8-green.svg[link="https://github.com/klaros-testmanagement/klaros-docker/releases"]
image:https://img.shields.io/badge/License-MIT-green[link="https://github.com/klaros-testmanagement/klaros-docker/blob/master/LICENSE"]
image:https://img.shields.io/badge/Community%20Edition-FREE-green[link="https://www.klaros-testmanagement.com/en_US/download"]
image:https://img.shields.io/twitter/follow/Klaros_TM?style=social[float="right", link="https://twitter.com/intent/follow?screen_name=Klaros_TM"]
Expand Down Expand Up @@ -111,7 +111,7 @@ Damit sind die Vorbereitungen für Linux abgeschlossen. Im Kapitel <<Installatio
|TOMCAT_MEMORY_MIN |128 |Minimal verfübarer Arbeitsspeicher in MB
|TOMCAT_MEMORY_MAX |768 |Maximal verfügbarer Arbeitsspeicher in MB
|JAVA_OPTS | |Mit JAVA_OPTS können zusätzliche Einstellungen an den Tomcat-Server übertragen werden. Beispielsweise kann die Zeitzone mit JAVA_OPTS -Duser.timezone=Europe/Berlin auf Europa/Berlin eingestellt werden.
|KLAROS_VERSION |${KLAROS_VERSION:-5.0.7} |Klaros-Release-Version, die während der Installation verwendet wird. Eine Liste der verfügbaren Releases finden Sie auf der offiziellen https://www.klaros-testmanagement.com/de_DE/download[Klaros-Testmanagement] Webseite oder auf https://github.com/klaros-testmanagement/klaros-docker/releases[GitHub]
|KLAROS_VERSION |${KLAROS_VERSION:-5.0.8} |Klaros-Release-Version, die während der Installation verwendet wird. Eine Liste der verfügbaren Releases finden Sie auf der offiziellen https://www.klaros-testmanagement.com/de_DE/download[Klaros-Testmanagement] Webseite oder auf https://github.com/klaros-testmanagement/klaros-docker/releases[GitHub]
|=======================

.Veränderbare Variablen nach dem ersten Serverstart über das Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ endif::[]
:toc: macro
:sectnums:

image:https://img.shields.io/badge/Version-5.0.7-green.svg[link="https://github.com/klaros-testmanagement/klaros-docker/releases"]
image:https://img.shields.io/badge/Version-5.0.8-green.svg[link="https://github.com/klaros-testmanagement/klaros-docker/releases"]
image:https://img.shields.io/badge/License-MIT-green[link="https://github.com/klaros-testmanagement/klaros-docker/blob/master/LICENSE"]
image:https://img.shields.io/badge/Community%20Edition-FREE-green[link="https://www.klaros-testmanagement.com/en_US/download"]
image:https://img.shields.io/twitter/follow/Klaros_TM?style=social[float="right", link="https://twitter.com/intent/follow?screen_name=Klaros_TM"]
Expand Down Expand Up @@ -112,7 +112,7 @@ This completes the preparations for Linux. The chapter <<Installation,Installati
|TOMCAT_MEMORY_MIN |128 |Minimum available RAM in MB
|TOMCAT_MEMORY_MAX |768 |Maximum available RAM in MB
|JAVA_OPTS | | With JAVA_OPTS additional settings can be transferred to the Tomcat server. For example the time zone can be set to Europe/Berlin with JAVA_OPTS -Duser.timezone=Europe/Berlin
|KLAROS_VERSION |${KLAROS_VERSION:-5.0.7} |Klaros release version, which is used during installation. A list of available releases can be found on the official https://www.klaros-testmanagement.com/en_US/download[Klaros Test Management] website or on https://github.com/klaros-testmanagement/klaros-docker/releases[GitHub]
|KLAROS_VERSION |${KLAROS_VERSION:-5.0.8} |Klaros release version, which is used during installation. A list of available releases can be found on the official https://www.klaros-testmanagement.com/en_US/download[Klaros Test Management] website or on https://github.com/klaros-testmanagement/klaros-docker/releases[GitHub]
|=======================

.Modifiable variables after the first server start via the Dockerfile
Expand Down

0 comments on commit 01c2641

Please sign in to comment.