From b8a0c930cc0b8130be021778fbb7dc59d31e56eb Mon Sep 17 00:00:00 2001 From: Torsten Stolpmann Date: Mon, 18 Dec 2023 12:00:16 +0100 Subject: [PATCH 1/3] Switch to Klaros 5.5.5. --- .html/Documentation-German.html | 2 +- .html/Documentation.html | 2 +- .html/README-German.html | 4 ++-- .html/README.html | 4 ++-- ApacheDerby/Dockerfile | 2 +- ApacheDerby/files/auto-install.xml | 2 +- Documentation-German.adoc | 2 +- Documentation.adoc | 2 +- MariaDB/db/Dockerfile | 2 +- MariaDB/klaros/Dockerfile | 2 +- MariaDB/klaros/files/auto-install.xml | 2 +- Microsoft SQL Server/klaros/Dockerfile | 2 +- Microsoft SQL Server/klaros/files/auto-install.xml | 2 +- MySQL/klaros/Dockerfile | 2 +- MySQL/klaros/files/auto-install.xml | 2 +- PostgreSQL/klaros/Dockerfile | 2 +- PostgreSQL/klaros/files/auto-install.xml | 2 +- README-German.adoc | 4 ++-- README.adoc | 4 ++-- 19 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.html/Documentation-German.html b/.html/Documentation-German.html index fba31eb..75fb652 100644 --- a/.html/Documentation-German.html +++ b/.html/Documentation-German.html @@ -444,7 +444,7 @@

Klaros-Testmanagement Docker-Integration

-

Version 5.5.4 green +

Version 5.5.5 green License MIT green Community%20Edition FREE green Klaros TM?style=social

diff --git a/.html/Documentation.html b/.html/Documentation.html index 57924f1..c78b42a 100644 --- a/.html/Documentation.html +++ b/.html/Documentation.html @@ -444,7 +444,7 @@

Klaros Test Management Docker-Integration

-

Version 5.5.4 green +

Version 5.5.5 green License MIT green Community%20Edition FREE green Klaros TM?style=social

diff --git a/.html/README-German.html b/.html/README-German.html index fc30771..93d4e68 100644 --- a/.html/README-German.html +++ b/.html/README-German.html @@ -444,7 +444,7 @@

Klaros-Testmanagement Docker-Integration

-

Version 5.5.4 green +

Version 5.5.5 green License MIT green Community%20Edition FREE green Klaros TM?style=social

@@ -680,7 +680,7 @@

3. Docker-Umgebungsvariablen k

KLAROS_VERSION

-

${KLAROS_VERSION:-5.5.4}

+

${KLAROS_VERSION:-5.5.5}

Klaros-Release-Version, die während der Installation verwendet wird. Eine Liste der verfügbaren Releases finden Sie auf der offiziellen Klaros-Testmanagement Webseite oder auf GitHub

diff --git a/.html/README.html b/.html/README.html index 3c3b0d4..09f3d5a 100644 --- a/.html/README.html +++ b/.html/README.html @@ -444,7 +444,7 @@

Klaros Test Management Docker-Integration

-

Version 5.5.4 green +

Version 5.5.5 green License MIT green Community%20Edition FREE green Klaros TM?style=social

@@ -678,7 +678,7 @@

3. Configuring Docker Environ

KLAROS_VERSION

-

${KLAROS_VERSION:-5.5.4}

+

${KLAROS_VERSION:-5.5.5}

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

diff --git a/ApacheDerby/Dockerfile b/ApacheDerby/Dockerfile index 5d755b7..8c2ed2c 100644 --- a/ApacheDerby/Dockerfile +++ b/ApacheDerby/Dockerfile @@ -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.5.4} +ENV KLAROS_VERSION ${KLAROS_VERSION:-5.5.5} # The location of the distributed Klaros installation files ENV KLAROS_DISTRIBUTION ${KLAROS_DISTRIBUTION:-https://www.klaros-testmanagement.com/files} diff --git a/ApacheDerby/files/auto-install.xml b/ApacheDerby/files/auto-install.xml index 0bc9db9..7f7d890 100644 --- a/ApacheDerby/files/auto-install.xml +++ b/ApacheDerby/files/auto-install.xml @@ -8,7 +8,7 @@ - + diff --git a/Documentation-German.adoc b/Documentation-German.adoc index 352af68..e82b8fc 100644 --- a/Documentation-German.adoc +++ b/Documentation-German.adoc @@ -12,7 +12,7 @@ endif::[] :sectnums: :toc-title: Inhaltsverzeichnis -image:https://img.shields.io/badge/Version-5.5.4-green.svg[link="https://github.com/klaros-testmanagement/klaros-docker/releases"] +image:https://img.shields.io/badge/Version-5.5.5-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"] diff --git a/Documentation.adoc b/Documentation.adoc index 5a6dc0d..3fd4800 100644 --- a/Documentation.adoc +++ b/Documentation.adoc @@ -11,7 +11,7 @@ endif::[] :toc: macro :sectnums: -image:https://img.shields.io/badge/Version-5.5.4-green.svg[link="https://github.com/klaros-testmanagement/klaros-docker/releases"] +image:https://img.shields.io/badge/Version-5.5.5-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"] diff --git a/MariaDB/db/Dockerfile b/MariaDB/db/Dockerfile index 0b95723..4d7b4a3 100644 --- a/MariaDB/db/Dockerfile +++ b/MariaDB/db/Dockerfile @@ -92,7 +92,7 @@ RUN set -e;\ echo 'Pin-Priority: 999'; \ } > /etc/apt/preferences.d/mariadb # add repository pinning to make sure dependencies from this MariaDB repo are preferred over Debian dependencies -# libmariadbclient18 : Depends: libmysqlclient18 (= 5.5.42+maria-1~wheezy) but 5.5.43-0+deb7u1 is to be installed +# libmariadbclient18 : Depends: libmysqlclient18 (= 5.5.52+maria-1~wheezy) but 5.5.53-0+deb7u1 is to be installed # the "/var/lib/mysql" stuff here is because the mysql-server postinst doesn't have an explicit way to disable the mysql_install_db codepath besides having a database already "configured" (ie, stuff in /var/lib/mysql/mysql) # also, we set debconf keys to make APT a little quieter diff --git a/MariaDB/klaros/Dockerfile b/MariaDB/klaros/Dockerfile index 03d3d75..a44c617 100644 --- a/MariaDB/klaros/Dockerfile +++ b/MariaDB/klaros/Dockerfile @@ -33,7 +33,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.5.4} +ENV KLAROS_VERSION ${KLAROS_VERSION:-5.5.5} # The location of the distributed Klaros installation files ENV KLAROS_DISTRIBUTION ${KLAROS_DISTRIBUTION:-https://www.klaros-testmanagement.com/files} diff --git a/MariaDB/klaros/files/auto-install.xml b/MariaDB/klaros/files/auto-install.xml index 0bc9db9..7f7d890 100644 --- a/MariaDB/klaros/files/auto-install.xml +++ b/MariaDB/klaros/files/auto-install.xml @@ -8,7 +8,7 @@ - + diff --git a/Microsoft SQL Server/klaros/Dockerfile b/Microsoft SQL Server/klaros/Dockerfile index 70b575f..20ae6b1 100644 --- a/Microsoft SQL Server/klaros/Dockerfile +++ b/Microsoft SQL Server/klaros/Dockerfile @@ -37,7 +37,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.5.4} +ENV KLAROS_VERSION ${KLAROS_VERSION:-5.5.5} # The location of the distributed Klaros installation files ENV KLAROS_DISTRIBUTION ${KLAROS_DISTRIBUTION:-https://www.klaros-testmanagement.com/files} diff --git a/Microsoft SQL Server/klaros/files/auto-install.xml b/Microsoft SQL Server/klaros/files/auto-install.xml index 0bc9db9..7f7d890 100644 --- a/Microsoft SQL Server/klaros/files/auto-install.xml +++ b/Microsoft SQL Server/klaros/files/auto-install.xml @@ -8,7 +8,7 @@ - + diff --git a/MySQL/klaros/Dockerfile b/MySQL/klaros/Dockerfile index ad114ed..f3ff522 100644 --- a/MySQL/klaros/Dockerfile +++ b/MySQL/klaros/Dockerfile @@ -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.5.4} +ENV KLAROS_VERSION ${KLAROS_VERSION:-5.5.5} # The location of the distributed Klaros installation files ENV KLAROS_DISTRIBUTION ${KLAROS_DISTRIBUTION:-https://www.klaros-testmanagement.com/files} diff --git a/MySQL/klaros/files/auto-install.xml b/MySQL/klaros/files/auto-install.xml index 0bc9db9..7f7d890 100644 --- a/MySQL/klaros/files/auto-install.xml +++ b/MySQL/klaros/files/auto-install.xml @@ -8,7 +8,7 @@ - + diff --git a/PostgreSQL/klaros/Dockerfile b/PostgreSQL/klaros/Dockerfile index ad114ed..f3ff522 100644 --- a/PostgreSQL/klaros/Dockerfile +++ b/PostgreSQL/klaros/Dockerfile @@ -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.5.4} +ENV KLAROS_VERSION ${KLAROS_VERSION:-5.5.5} # The location of the distributed Klaros installation files ENV KLAROS_DISTRIBUTION ${KLAROS_DISTRIBUTION:-https://www.klaros-testmanagement.com/files} diff --git a/PostgreSQL/klaros/files/auto-install.xml b/PostgreSQL/klaros/files/auto-install.xml index 0bc9db9..7f7d890 100644 --- a/PostgreSQL/klaros/files/auto-install.xml +++ b/PostgreSQL/klaros/files/auto-install.xml @@ -8,7 +8,7 @@ - + diff --git a/README-German.adoc b/README-German.adoc index 8885850..736cff9 100644 --- a/README-German.adoc +++ b/README-German.adoc @@ -12,7 +12,7 @@ endif::[] :sectnums: :toc-title: Inhaltsverzeichnis -image:https://img.shields.io/badge/Version-5.5.4-green.svg[link="https://github.com/klaros-testmanagement/klaros-docker/releases"] +image:https://img.shields.io/badge/Version-5.5.5-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"] @@ -111,7 +111,7 @@ Damit sind die Vorbereitungen für Linux abgeschlossen. Im Kapitel < Date: Mon, 18 Dec 2023 14:12:35 +0100 Subject: [PATCH 2/3] Fioxed distribution path. --- ApacheDerby/Dockerfile | 2 +- MariaDB/klaros/Dockerfile | 2 +- Microsoft SQL Server/klaros/Dockerfile | 2 +- MySQL/klaros/Dockerfile | 2 +- PostgreSQL/klaros/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ApacheDerby/Dockerfile b/ApacheDerby/Dockerfile index 8c2ed2c..0a8f26d 100644 --- a/ApacheDerby/Dockerfile +++ b/ApacheDerby/Dockerfile @@ -48,7 +48,7 @@ ENV CATALINA_BASE /data/catalina-base EXPOSE ${TOMCAT_HTTP_PORT} ADD files/auto-install.xml /tmp/auto-install.xml -ADD ${KLAROS_DISTRIBUTION}/${KLAROS_VERSION}/Klaros-${KLAROS_VERSION}-Setup.jar /tmp/Klaros-Setup.jar +ADD ${KLAROS_DISTRIBUTION}/${KLAROS_VERSION}/Klaros-Setup.jar /tmp/Klaros-Setup.jar ADD .start.sh / RUN set -xe \ diff --git a/MariaDB/klaros/Dockerfile b/MariaDB/klaros/Dockerfile index a44c617..92ecbe4 100644 --- a/MariaDB/klaros/Dockerfile +++ b/MariaDB/klaros/Dockerfile @@ -44,7 +44,7 @@ EXPOSE ${TOMCAT_HTTP_PORT} ADD files/auto-install.xml /tmp/auto-install.xml ADD files/catalina-wrapper.sh /root/catalina-wrapper.sh -ADD ${KLAROS_DISTRIBUTION}/${KLAROS_VERSION}/Klaros-${KLAROS_VERSION}-Setup.jar /tmp/Klaros-Setup.jar +ADD ${KLAROS_DISTRIBUTION}/${KLAROS_VERSION}/Klaros-Setup.jar /tmp/Klaros-Setup.jar RUN set -xe \ && apt-get -y update \ diff --git a/Microsoft SQL Server/klaros/Dockerfile b/Microsoft SQL Server/klaros/Dockerfile index 20ae6b1..7ff4f93 100644 --- a/Microsoft SQL Server/klaros/Dockerfile +++ b/Microsoft SQL Server/klaros/Dockerfile @@ -48,7 +48,7 @@ EXPOSE ${TOMCAT_HTTP_PORT} ADD files/auto-install.xml /tmp/auto-install.xml ADD files/catalina-wrapper.sh /root/catalina-wrapper.sh -ADD ${KLAROS_DISTRIBUTION}/${KLAROS_VERSION}/Klaros-${KLAROS_VERSION}-Setup.jar /tmp/Klaros-Setup.jar +ADD ${KLAROS_DISTRIBUTION}/${KLAROS_VERSION}/Klaros-Setup.jar /tmp/Klaros-Setup.jar RUN set -xe \ && apt-get -y update \ diff --git a/MySQL/klaros/Dockerfile b/MySQL/klaros/Dockerfile index f3ff522..412afe2 100644 --- a/MySQL/klaros/Dockerfile +++ b/MySQL/klaros/Dockerfile @@ -43,7 +43,7 @@ EXPOSE ${TOMCAT_HTTP_PORT} ADD files/auto-install.xml /tmp/auto-install.xml ADD files/catalina-wrapper.sh /root/catalina-wrapper.sh -ADD ${KLAROS_DISTRIBUTION}/${KLAROS_VERSION}/Klaros-${KLAROS_VERSION}-Setup.jar /tmp/Klaros-Setup.jar +ADD ${KLAROS_DISTRIBUTION}/${KLAROS_VERSION}/Klaros-Setup.jar /tmp/Klaros-Setup.jar RUN set -xe \ && apt-get -y update \ diff --git a/PostgreSQL/klaros/Dockerfile b/PostgreSQL/klaros/Dockerfile index f3ff522..412afe2 100644 --- a/PostgreSQL/klaros/Dockerfile +++ b/PostgreSQL/klaros/Dockerfile @@ -43,7 +43,7 @@ EXPOSE ${TOMCAT_HTTP_PORT} ADD files/auto-install.xml /tmp/auto-install.xml ADD files/catalina-wrapper.sh /root/catalina-wrapper.sh -ADD ${KLAROS_DISTRIBUTION}/${KLAROS_VERSION}/Klaros-${KLAROS_VERSION}-Setup.jar /tmp/Klaros-Setup.jar +ADD ${KLAROS_DISTRIBUTION}/${KLAROS_VERSION}/Klaros-Setup.jar /tmp/Klaros-Setup.jar RUN set -xe \ && apt-get -y update \ From 2f8965b5532ae14b0adc747035434261debeb68f Mon Sep 17 00:00:00 2001 From: Torsten Stolpmann Date: Mon, 18 Dec 2023 14:12:46 +0100 Subject: [PATCH 3/3] Fixed public key. --- MySQL/db/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MySQL/db/Dockerfile b/MySQL/db/Dockerfile index 3662b19..37a12eb 100644 --- a/MySQL/db/Dockerfile +++ b/MySQL/db/Dockerfile @@ -40,7 +40,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ RUN set -ex; \ # gpg: key 5072E1F5: public key "MySQL Release Engineering " imported - key='467B942D3A79BD29'; \ + key='B7B3B788A8D3785C'; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key"; \ gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/mysql.gpg; \