Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

template-generator + new images pack 3 #67

Merged
merged 2 commits into from
Jan 25, 2022
Merged

template-generator + new images pack 3 #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9efbfd3
2022
stamepicmorg Jan 25, 2022
7e9459e
updates
stamepicmorg Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 4 additions & 6 deletions linux/ecosystem/testrail/ad/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#set -e
#env

echo "[testrail] Starting testrail service"

##################################################################################

Expand All @@ -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}
Expand All @@ -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"
Expand All @@ -45,7 +44,6 @@ while /bin/true; do
done &
echo "[testrail] Background task stoped"


#################################################################################

if [[ -z "${FIX_WWW_DATA}" ]]; then
Expand Down
3 changes: 2 additions & 1 deletion linux/ecosystem/testrail/latest/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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} && \
Expand Down
2 changes: 1 addition & 1 deletion linux/ecosystem/testrail/latest/apache_testrail.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<VirtualHost *:80>
#ServerName www.example.com
ServerName localhost

ServerAdmin webmaster@localhost
DocumentRoot /var/www/testrail
Expand Down
11 changes: 5 additions & 6 deletions linux/ecosystem/testrail/latest/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#!/bin/bash

#set -e
#env
echo "[testrail] Starting testrail service"

##################################################################################
#################################################################################

function createOptDirectory {
if [ ! -d $1 ]
Expand All @@ -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}

#################################################################################

Expand All @@ -43,7 +43,6 @@ while /bin/true; do
done &
echo "[testrail] Background task stoped"


#################################################################################

if [[ -z "${FIX_WWW_DATA}" ]]; then
Expand Down
11 changes: 6 additions & 5 deletions linux/ecosystem/testrail/ldap/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash
#set -e

echo "[testrail] Starting testrail service"

#################################################################################

function createOptDirectory {
if [ ! -d $1 ]
Expand All @@ -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}
Expand All @@ -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"
Expand All @@ -42,7 +44,6 @@ while /bin/true; do
done &
echo "[testrail] Background task stoped"


#################################################################################

if [[ -z "${FIX_WWW_DATA}" ]]; then
Expand Down