Merge branch 'develop'

EpicMorg · Jan 25, 2022 · 103946d · 103946d
2 parents 5bdd4cd + 7e9459e
commit 103946d
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 21 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2021 EpicMorg: Main
+Copyright (c) 2018-2022 EpicMorg: Main
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Makefile b/Makefile
@@ -122,7 +122,9 @@ ecosystem-images:
 	cd `pwd`/linux/ecosystem/apache2/php7.3         && pwd && make
 	cd `pwd`/linux/ecosystem/apache2/php7.4         && pwd && make
 
-	cd `pwd`/linux/ecosystem/testrail              && pwd && make
+	cd `pwd`/linux/ecosystem/testrail/latest       && pwd && make
+	cd `pwd`/linux/ecosystem/testrail/ad           && pwd && make
+	cd `pwd`/linux/ecosystem/testrail/ldap         && pwd && make
 
 	cd `pwd`/linux/ecosystem/torrserver            && pwd && make
 

diff --git a/linux/ecosystem/testrail/ad/run.sh b/linux/ecosystem/testrail/ad/run.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-#set -e
-#env
+
+echo "[testrail] Starting testrail service"
 
 ##################################################################################
 
@@ -17,10 +17,10 @@ function createOptDirectory {
 /bin/cp -rf ${TESTRAIL_RELEASE_DIR}/apache-conf/000-default.conf /etc/apache2/sites-enabled/000-default.conf
 
 echo "[testrail] Unzipping testrail service"
-unzip -o ${TESTRAIL_RELEASE_DIR}/testrail.zip -d /var/www/
+unzip -q -o ${TESTRAIL_RELEASE_DIR}/testrail.zip -d /var/www/
 
 echo "[testrail] Unzipping testrail Active Directory auth plugin"
-unzip -o -j ${TESTRAIL_RELEASE_DIR}/${TESTRAIL_PLUGIN_FILE} ${TESTRAIL_PLUGIN_FULLNAME}/auth.php -d ${TR_CUSTOM_AUTH_DIR}
+unzip -q -o -j ${TESTRAIL_RELEASE_DIR}/${TESTRAIL_PLUGIN_FILE} ${TESTRAIL_PLUGIN_FULLNAME}/auth.php -d ${TR_CUSTOM_AUTH_DIR}
 
 createOptDirectory ${TR_DEFAULT_LOG_DIR}
 createOptDirectory ${TR_DEFAULT_AUDIT_DIR}
@@ -29,7 +29,6 @@ createOptDirectory ${TR_DEFAULT_ATTACHMENT_DIR}
 
 chown -R www-data:www-data ${TR_CONFIG_DIR}
 
-
 #################################################################################
 
 echo "[testrail] Waiting for background task file"
@@ -45,7 +44,6 @@ while /bin/true; do
 done &
 echo "[testrail] Background task stoped"
 
-
 #################################################################################
 
 if [[ -z "${FIX_WWW_DATA}" ]]; then

diff --git a/linux/ecosystem/testrail/latest/Dockerfile b/linux/ecosystem/testrail/latest/Dockerfile
@@ -27,6 +27,7 @@ RUN \
     apt-get update && \
     apt-get install -y --no-install-recommends zlib1g-dev libcurl4-gnutls-dev libldap2-dev zlib1g-dev libxml2-dev libfontconfig1 && \
     apt-get clean && \
+    echo "ServerName localhost" >> /etc/apache2/apache2.conf && \
     rm -rf /var/lib/apt/lists/* && \
     rm -rf /run.sh
 
@@ -39,7 +40,7 @@ RUN \
   echo "[testrail] Downloading and installing" && \
   wget --no-check-certificate -O ${TESTRAIL_RELEASE_DIR}/testrail.zip ${DOWNLOAD_URL} && \
   chown -R www-data:www-data ${TESTRAIL_RELEASE_DIR} && \
-  unzip -o ${TESTRAIL_RELEASE_DIR}/testrail.zip -d /var/www/ && \
+  unzip -q -o ${TESTRAIL_RELEASE_DIR}/testrail.zip -d /var/www/ && \
   chown -R www-data:www-data ${TR_WWW_PATH} && \
   ls -las ${TR_WWW_PATH} && \
   chown -R www-data:www-data ${TR_OPT_PATH} && \

diff --git a/linux/ecosystem/testrail/latest/apache_testrail.conf b/linux/ecosystem/testrail/latest/apache_testrail.conf
@@ -1,5 +1,5 @@
 <VirtualHost *:80>
-        #ServerName www.example.com
+        ServerName localhost
 
         ServerAdmin webmaster@localhost
         DocumentRoot /var/www/testrail

diff --git a/linux/ecosystem/testrail/latest/run.sh b/linux/ecosystem/testrail/latest/run.sh
@@ -1,9 +1,8 @@
 #!/bin/bash
 
-#set -e
-#env
+echo "[testrail] Starting testrail service"
 
-##################################################################################
+#################################################################################
 
 function createOptDirectory {
     if [ ! -d $1 ]
@@ -18,15 +17,16 @@ function createOptDirectory {
 /bin/cp -rf ${TESTRAIL_RELEASE_DIR}/apache-conf/000-default.conf /etc/apache2/sites-enabled/000-default.conf
 
 echo "[testrail] Unzipping testrail service"
-unzip -o ${TESTRAIL_RELEASE_DIR}/testrail.zip -d /var/www/
+unzip -q -o ${TESTRAIL_RELEASE_DIR}/testrail.zip -d /var/www/
+echo "[testrail] Testrail extracted"
 
 createOptDirectory ${TR_DEFAULT_LOG_DIR}
 createOptDirectory ${TR_DEFAULT_AUDIT_DIR}
 createOptDirectory ${TR_DEFAULT_REPORT_DIR}
 createOptDirectory ${TR_DEFAULT_ATTACHMENT_DIR}
 
 chown -R www-data:www-data ${TR_CONFIG_DIR}
-
+chown -R www-data:www-data ${TR_CONFIGPATH}
 
 #################################################################################
 
@@ -43,7 +43,6 @@ while /bin/true; do
 done &
 echo "[testrail] Background task stoped"
 
-
 #################################################################################
 
 if [[ -z "${FIX_WWW_DATA}" ]]; then

diff --git a/linux/ecosystem/testrail/ldap/run.sh b/linux/ecosystem/testrail/ldap/run.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
-#set -e
+
+echo "[testrail] Starting testrail service"
+
+#################################################################################
 
 function createOptDirectory {
     if [ ! -d $1 ]
@@ -14,10 +17,10 @@ function createOptDirectory {
 /bin/cp -rf ${TESTRAIL_RELEASE_DIR}/apache-conf/000-default.conf /etc/apache2/sites-enabled/000-default.conf
 
 echo "[testrail] Unzipping testrail service"
-unzip -o ${TESTRAIL_RELEASE_DIR}/testrail.zip -d /var/www/
+unzip -q -o ${TESTRAIL_RELEASE_DIR}/testrail.zip -d /var/www/
 
 echo "[testrail] Unzipping testrail LDAP auth plugin"
-unzip -o -j ${TESTRAIL_RELEASE_DIR}/${TESTRAIL_PLUGIN_FILE} ${TESTRAIL_PLUGIN_FULLNAME}/auth.php -d ${TR_CUSTOM_AUTH_DIR}
+unzip -q -o -j ${TESTRAIL_RELEASE_DIR}/${TESTRAIL_PLUGIN_FILE} ${TESTRAIL_PLUGIN_FULLNAME}/auth.php -d ${TR_CUSTOM_AUTH_DIR}
 
 createOptDirectory ${TR_DEFAULT_LOG_DIR}
 createOptDirectory ${TR_DEFAULT_AUDIT_DIR}
@@ -26,7 +29,6 @@ createOptDirectory ${TR_DEFAULT_ATTACHMENT_DIR}
 
 chown -R www-data:www-data ${TR_CONFIG_DIR}
 
-
 #################################################################################
 
 echo "[testrail] Waiting for background task file"
@@ -42,7 +44,6 @@ while /bin/true; do
 done &
 echo "[testrail] Background task stoped"
 
-
 #################################################################################
 
 if [[ -z "${FIX_WWW_DATA}" ]]; then