[Rt-commit] rt branch, 5.0/docker-tests, updated. rt-5.0.0alpha1-20-g6777a237c

[Jim Brandt]

The branch, 5.0/docker-tests has been updated
       via  6777a237c80483c829f0a41f0639b953559173ea (commit)
       via  9e8e55fff1e18b7192415a023eade3440428d59f (commit)
      from  0e19e264b64fc33458f6c1e7b4b26712939ed660 (commit)

Summary of changes:
 Dockerfile     | 9 +++++----
 lib/RT/Test.pm | 3 +++
 2 files changed, 8 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit 9e8e55fff1e18b7192415a023eade3440428d59f
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Wed Mar 11 16:59:46 2020 -0400

    Set RT_HOST only if set in ENV

diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index 59cf8ba8e..a59508ca2 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -323,6 +323,9 @@ Set( \$ShowHistory, "always");
     }
     if ( $ENV{'RT_TEST_DB_HOST'} ) {
         print $config "Set( \$DatabaseHost , '$ENV{'RT_TEST_DB_HOST'}');\n";
+    }
+    if ( $ENV{'RT_TEST_RT_HOST'} ) {
+        # Used to add rights for test users in the DB when testing mysql/mariadb
         print $config "Set( \$DatabaseRTHost , '$ENV{'RT_TEST_RT_HOST'}');\n";
     }
 

commit 6777a237c80483c829f0a41f0639b953559173ea
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Wed Mar 11 17:20:35 2020 -0400

    Pull from BPS base image

diff --git a/Dockerfile b/Dockerfile
index 98cd60c37..3d8894c27 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM netsandbox/request-tracker-base
+FROM bpssysadmin/rt-base-debian-stretch
 
 ENV RT_TEST_PARALLEL 1
 ENV RT_DBA_USER root
@@ -11,7 +11,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
   autoconf \
   libnet-ldap-server-test-perl \
   libencode-hanextra-perl \
-#  libhtml-gumbo-perl \
   libgumbo1 \
   build-essential \
   libhtml-formatexternal-perl \
@@ -20,8 +19,10 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
 
 RUN cpanm \
   Encode::Detect::Detector \
-  HTML::Gumbo
-# && rm -rf /root/.cpanm
+  HTML::Gumbo \
+ && rm -rf /root/.cpanm
+
+CMD tail -f /dev/null
 
 #RUN cd /usr/local/ \
 #  && git clone https://github.com/bestpractical/rt.git \

-----------------------------------------------------------------------