mirror of
https://github.com/EpicMorg/docker-scripts.git
synced 2025-01-23 20:18:13 +03:00
updates
This commit is contained in:
parent
9efbfd38ac
commit
7e9459e6a9
4
Makefile
4
Makefile
@ -122,7 +122,9 @@ ecosystem-images:
|
|||||||
cd `pwd`/linux/ecosystem/apache2/php7.3 && pwd && make
|
cd `pwd`/linux/ecosystem/apache2/php7.3 && pwd && make
|
||||||
cd `pwd`/linux/ecosystem/apache2/php7.4 && 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
|
cd `pwd`/linux/ecosystem/torrserver && pwd && make
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/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
|
/bin/cp -rf ${TESTRAIL_RELEASE_DIR}/apache-conf/000-default.conf /etc/apache2/sites-enabled/000-default.conf
|
||||||
|
|
||||||
echo "[testrail] Unzipping testrail service"
|
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"
|
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_LOG_DIR}
|
||||||
createOptDirectory ${TR_DEFAULT_AUDIT_DIR}
|
createOptDirectory ${TR_DEFAULT_AUDIT_DIR}
|
||||||
@ -29,7 +29,6 @@ createOptDirectory ${TR_DEFAULT_ATTACHMENT_DIR}
|
|||||||
|
|
||||||
chown -R www-data:www-data ${TR_CONFIG_DIR}
|
chown -R www-data:www-data ${TR_CONFIG_DIR}
|
||||||
|
|
||||||
|
|
||||||
#################################################################################
|
#################################################################################
|
||||||
|
|
||||||
echo "[testrail] Waiting for background task file"
|
echo "[testrail] Waiting for background task file"
|
||||||
@ -45,7 +44,6 @@ while /bin/true; do
|
|||||||
done &
|
done &
|
||||||
echo "[testrail] Background task stoped"
|
echo "[testrail] Background task stoped"
|
||||||
|
|
||||||
|
|
||||||
#################################################################################
|
#################################################################################
|
||||||
|
|
||||||
if [[ -z "${FIX_WWW_DATA}" ]]; then
|
if [[ -z "${FIX_WWW_DATA}" ]]; then
|
||||||
|
@ -27,6 +27,7 @@ RUN \
|
|||||||
apt-get update && \
|
apt-get update && \
|
||||||
apt-get install -y --no-install-recommends zlib1g-dev libcurl4-gnutls-dev libldap2-dev zlib1g-dev libxml2-dev libfontconfig1 && \
|
apt-get install -y --no-install-recommends zlib1g-dev libcurl4-gnutls-dev libldap2-dev zlib1g-dev libxml2-dev libfontconfig1 && \
|
||||||
apt-get clean && \
|
apt-get clean && \
|
||||||
|
echo "ServerName localhost" >> /etc/apache2/apache2.conf && \
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
rm -rf /var/lib/apt/lists/* && \
|
||||||
rm -rf /run.sh
|
rm -rf /run.sh
|
||||||
|
|
||||||
@ -39,7 +40,7 @@ RUN \
|
|||||||
echo "[testrail] Downloading and installing" && \
|
echo "[testrail] Downloading and installing" && \
|
||||||
wget --no-check-certificate -O ${TESTRAIL_RELEASE_DIR}/testrail.zip ${DOWNLOAD_URL} && \
|
wget --no-check-certificate -O ${TESTRAIL_RELEASE_DIR}/testrail.zip ${DOWNLOAD_URL} && \
|
||||||
chown -R www-data:www-data ${TESTRAIL_RELEASE_DIR} && \
|
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} && \
|
chown -R www-data:www-data ${TR_WWW_PATH} && \
|
||||||
ls -las ${TR_WWW_PATH} && \
|
ls -las ${TR_WWW_PATH} && \
|
||||||
chown -R www-data:www-data ${TR_OPT_PATH} && \
|
chown -R www-data:www-data ${TR_OPT_PATH} && \
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<VirtualHost *:80>
|
<VirtualHost *:80>
|
||||||
#ServerName www.example.com
|
ServerName localhost
|
||||||
|
|
||||||
ServerAdmin webmaster@localhost
|
ServerAdmin webmaster@localhost
|
||||||
DocumentRoot /var/www/testrail
|
DocumentRoot /var/www/testrail
|
||||||
|
@ -1,9 +1,8 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
#set -e
|
echo "[testrail] Starting testrail service"
|
||||||
#env
|
|
||||||
|
|
||||||
##################################################################################
|
#################################################################################
|
||||||
|
|
||||||
function createOptDirectory {
|
function createOptDirectory {
|
||||||
if [ ! -d $1 ]
|
if [ ! -d $1 ]
|
||||||
@ -18,7 +17,8 @@ function createOptDirectory {
|
|||||||
/bin/cp -rf ${TESTRAIL_RELEASE_DIR}/apache-conf/000-default.conf /etc/apache2/sites-enabled/000-default.conf
|
/bin/cp -rf ${TESTRAIL_RELEASE_DIR}/apache-conf/000-default.conf /etc/apache2/sites-enabled/000-default.conf
|
||||||
|
|
||||||
echo "[testrail] Unzipping testrail service"
|
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_LOG_DIR}
|
||||||
createOptDirectory ${TR_DEFAULT_AUDIT_DIR}
|
createOptDirectory ${TR_DEFAULT_AUDIT_DIR}
|
||||||
@ -26,7 +26,7 @@ createOptDirectory ${TR_DEFAULT_REPORT_DIR}
|
|||||||
createOptDirectory ${TR_DEFAULT_ATTACHMENT_DIR}
|
createOptDirectory ${TR_DEFAULT_ATTACHMENT_DIR}
|
||||||
|
|
||||||
chown -R www-data:www-data ${TR_CONFIG_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 &
|
done &
|
||||||
echo "[testrail] Background task stoped"
|
echo "[testrail] Background task stoped"
|
||||||
|
|
||||||
|
|
||||||
#################################################################################
|
#################################################################################
|
||||||
|
|
||||||
if [[ -z "${FIX_WWW_DATA}" ]]; then
|
if [[ -z "${FIX_WWW_DATA}" ]]; then
|
||||||
|
@ -1,5 +1,8 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
#set -e
|
|
||||||
|
echo "[testrail] Starting testrail service"
|
||||||
|
|
||||||
|
#################################################################################
|
||||||
|
|
||||||
function createOptDirectory {
|
function createOptDirectory {
|
||||||
if [ ! -d $1 ]
|
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
|
/bin/cp -rf ${TESTRAIL_RELEASE_DIR}/apache-conf/000-default.conf /etc/apache2/sites-enabled/000-default.conf
|
||||||
|
|
||||||
echo "[testrail] Unzipping testrail service"
|
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"
|
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_LOG_DIR}
|
||||||
createOptDirectory ${TR_DEFAULT_AUDIT_DIR}
|
createOptDirectory ${TR_DEFAULT_AUDIT_DIR}
|
||||||
@ -26,7 +29,6 @@ createOptDirectory ${TR_DEFAULT_ATTACHMENT_DIR}
|
|||||||
|
|
||||||
chown -R www-data:www-data ${TR_CONFIG_DIR}
|
chown -R www-data:www-data ${TR_CONFIG_DIR}
|
||||||
|
|
||||||
|
|
||||||
#################################################################################
|
#################################################################################
|
||||||
|
|
||||||
echo "[testrail] Waiting for background task file"
|
echo "[testrail] Waiting for background task file"
|
||||||
@ -42,7 +44,6 @@ while /bin/true; do
|
|||||||
done &
|
done &
|
||||||
echo "[testrail] Background task stoped"
|
echo "[testrail] Background task stoped"
|
||||||
|
|
||||||
|
|
||||||
#################################################################################
|
#################################################################################
|
||||||
|
|
||||||
if [[ -z "${FIX_WWW_DATA}" ]]; then
|
if [[ -z "${FIX_WWW_DATA}" ]]; then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user