Phil/piler-docker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(simatec) Beta v0.8.3

Browse source
This commit is contained in:
simatec 2023-01-19 09:44:17 +01:00
parent cc10d5e444
commit dcf14cfbed
4 changed files with 80 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -145,6 +145,9 @@ To leave the container on the console you have to execute 2x `exit`.
## Changelog ## Changelog
### 0.8.3 (19.01.2023)
* (simatec) Update himself added
### 0.8.2 (18.01.2023) ### 0.8.2 (18.01.2023)
* (simatec) docker, curl and git Check added * (simatec) docker, curl and git Check added
* (simatec) Update Config added * (simatec) Update Config added

35
install-piler.sh
View file

@ -21,6 +21,7 @@ else
fi fi
HLINE="==================================================================" HLINE="=================================================================="
HLINE_SMALL="==============================="
BLA_metro=( 0.2 ' ' '= ' '== ' '=== ' ' ===' ' ==' ' =' ) BLA_metro=( 0.2 ' ' '= ' '== ' '=== ' ' ===' ' ==' ' =' )
@ -88,16 +89,24 @@ fi
####################################################################################### #######################################################################################
# Path-Settings # Path-Settings
installPth="/opt/piler-docker" installPth=`pwd`
configPth="/opt/piler-docker/config" configPth="$installPth/config"
etcPth="/var/lib/docker/volumes/piler-docker_piler_etc/_data" etcPth="/var/lib/docker/volumes/piler-docker_piler_etc/_data"
# Load config
. ./piler.conf
############################## Installer Settings ###################################### ############################## Installer Settings ######################################
if [ ! -f $installPth/.configDone ]; then if [ ! -f $installPth/.configDone ]; then
# create config
if [ ! -f $installPth/piler.conf ]; then
if [ -f $installPth/piler.conf.example ]; then
cp $installPth/piler.conf.example $installPth/piler.conf
fi
fi
# Load config
. ./piler.conf
# Piler-Domain # Piler-Domain
read -ep "Please set your Piler-Domain (Enter for default: $PILER_DOMAIN): " pilerDomain read -ep "Please set your Piler-Domain (Enter for default: $PILER_DOMAIN): " pilerDomain
pilerDomain=${pilerDomain:=$PILER_DOMAIN} pilerDomain=${pilerDomain:=$PILER_DOMAIN}
@ -201,6 +210,9 @@ if [ ! -f $installPth/.configDone ]; then
touch $installPth/.configDone touch $installPth/.configDone
elif [ -f $installPth/.configDone ]; then elif [ -f $installPth/.configDone ]; then
# Load config
. ./piler.conf
select name in Install-Piler Update-Piler select name in Install-Piler Update-Piler
do do
if [ $name = "Install-Piler" ]; then if [ $name = "Install-Piler" ]; then
@ -211,6 +223,15 @@ elif [ -f $installPth/.configDone ]; then
echo echo
echo "${blue}Ready for: $name${normal}" echo "${blue}Ready for: $name${normal}"
echo echo
for fileUpdate in update.sh README.md; do
echo "${purple}${HLINE}${HLINE_SMALL}"
echo "${purple}****** Download Update $fileUpdate ******"
curl -o $installPth/$fileUpdate https://raw.githubusercontent.com/simatec/piler-docker/main/config/$fileUpdate
echo "${purple}${HLINE}${HLINE_SMALL}${normal}"
echo
done
bash $installPth/update.sh && exit 1 bash $installPth/update.sh && exit 1
fi fi
done done
@ -437,12 +458,12 @@ echo "${greenBold} Piler install completed successfully"
echo "${greenBold}${HLINE}${normal}" echo "${greenBold}${HLINE}${normal}"
echo echo
echo echo
echo "${greenBold}${HLINE}" echo "${greenBold}${HLINE}${HLINE_SMALL}"
if [ "$USE_LETSENCRYPT" = "yes" ]; then if [ "$USE_LETSENCRYPT" = "yes" ]; then
echo "${greenBold}you can start in your Browser with https://${PILER_DOMAIN}!" echo "${greenBold}you can start in your Browser with https://${PILER_DOMAIN}!"
else else
echo "${greenBold}you can start in your Browser with:" echo "${greenBold}you can start in your Browser with:"
echo "${greenBold}http://${PILER_DOMAIN} or http://local-ip" echo "${greenBold}http://${PILER_DOMAIN} or http://local-ip"
fi fi
echo "${greenBold}${HLINE}${normal}" echo "${greenBold}${HLINE}${HLINE_SMALL}${normal}"
echo echo

0
piler.conf → piler.conf.example
View file

88
update.sh
View file

@ -21,6 +21,7 @@ else
fi fi
HLINE="==================================================================" HLINE="=================================================================="
HLINE_SMALL="==============================="
BLA_metro=( 0.2 ' ' '= ' '== ' '=== ' ' ===' ' ==' ' =' ) BLA_metro=( 0.2 ' ' '= ' '== ' '=== ' ' ===' ' ==' ' =' )
@ -97,19 +98,19 @@ while true; do
esac esac
done done
installPth="/opt/piler-docker" installPth=`pwd`
configPth="/opt/piler-docker/config" configPth="$installPth/config"
etcPth="/var/lib/docker/volumes/piler-docker_piler_etc/_data" etcPth="/var/lib/docker/volumes/piler-docker_piler_etc/_data"
# config load # config load
. ./piler.conf . ./piler.conf
if [ ! -f $installPth/.env ]; then if [ ! -f $installPth/.env ]; then
ln -s ./piler.conf .env ln -s ./piler.conf .env
fi fi
if [ -f $installPth/docker-compose.yml ]; then if [ -f $installPth/docker-compose.yml ]; then
rm $installPth/docker-compose.yml rm $installPth/docker-compose.yml
fi fi
# Download yml update # Download yml update
@ -119,31 +120,38 @@ echo "${greenBold} Download Update files for Piler"
echo "${greenBold}${HLINE}${normal}" echo "${greenBold}${HLINE}${normal}"
echo echo
#cd $configPth # Update Files
for ymlUpdate in piler-default.yml piler-ssl.yml; do
echo
echo "${purple}${HLINE}${HLINE_SMALL}"
echo "${purple}****** Download Update $ymlUpdate ******"
curl -o $configPth/$ymlUpdate https://raw.githubusercontent.com/simatec/piler-docker/main/config/$ymlUpdate
echo "${purple}${HLINE}${HLINE_SMALL}${normal}"
echo
done
# Update yml for fileUpdate in install-piler.sh LICENSE piler.conf.example; do
echo echo
echo "${purple}${HLINE}" echo "${purple}${HLINE}${HLINE_SMALL}"
echo "${purple}****** Download Update files piler-default.yml ******" echo "${purple}****** Download Update $fileUpdate ******"
curl -o $configPth/piler-default.yml https://raw.githubusercontent.com/simatec/piler-docker/main/config/piler-default.yml curl -o $installPth/$fileUpdate https://raw.githubusercontent.com/simatec/piler-docker/main/config/$fileUpdate
echo "${purple}****** Download Update files piler-ssl.yml ******" echo "${purple}${HLINE}${HLINE_SMALL}${normal}"
curl -o $configPth/piler-ssl.yml https://raw.githubusercontent.com/simatec/piler-docker/main/config/piler-ssl.yml echo
echo "${purple}${HLINE}${normal}" done
echo
# old docker stop # old docker stop
cd $installPth cd $installPth
if [ $COMPOSE_VERSION = native ]; then if [ $COMPOSE_VERSION = native ]; then
docker compose down docker compose down
else else
docker-compose down docker-compose down
fi fi
if [ "$USE_LETSENCRYPT" = "yes" ]; then if [ "$USE_LETSENCRYPT" = "yes" ]; then
cp $configPth/piler-ssl.yml $installPth/docker-compose.yml cp $configPth/piler-ssl.yml $installPth/docker-compose.yml
else else
cp $configPth/piler-default.yml $installPth/docker-compose.yml cp $configPth/piler-default.yml $installPth/docker-compose.yml
fi fi
# start Update Container # start Update Container
@ -155,20 +163,20 @@ echo
if [ "$USE_LETSENCRYPT" = "yes" ]; then if [ "$USE_LETSENCRYPT" = "yes" ]; then
if ! docker network ls | grep -o "nginx-proxy"; then if ! docker network ls | grep -o "nginx-proxy"; then
docker network create nginx-proxy docker network create nginx-proxy
echo echo
echo "${blue}${HLINE}" echo "${blue}${HLINE}"
echo "${blue} docker network created" echo "${blue} docker network created"
echo "${blue}${HLINE}${normal}" echo "${blue}${HLINE}${normal}"
echo echo
fi fi
fi fi
if [ $COMPOSE_VERSION = native ]; then if [ $COMPOSE_VERSION = native ]; then
docker compose up --force-recreate --build -d docker compose up --force-recreate --build -d
else else
docker-compose up --force-recreate --build -d docker-compose up --force-recreate --build -d
fi fi
echo "${blue}********* Piler started... Please wait... *********${normal}" echo "${blue}********* Piler started... Please wait... *********${normal}"
@ -178,10 +186,10 @@ sleep 20
BLA::stop_loading_animation BLA::stop_loading_animation
if [ ! -f $etcPth/config-site.php.bak ]; then if [ ! -f $etcPth/config-site.php.bak ]; then
cp $etcPth/config-site.php $etcPth/config-site.php.bak cp $etcPth/config-site.php $etcPth/config-site.php.bak
else else
rm $etcPth/config-site.php rm $etcPth/config-site.php
cp $etcPth/config-site.php.bak $etcPth/config-site.php cp $etcPth/config-site.php.bak $etcPth/config-site.php
fi fi
echo echo
@ -275,10 +283,10 @@ fi
# add config settings # add config settings
if [ ! -f $etcPth/piler.conf.bak ]; then if [ ! -f $etcPth/piler.conf.bak ]; then
cp $etcPth/piler.conf $etcPth/piler.conf.bak cp $etcPth/piler.conf $etcPth/piler.conf.bak
else else
rm $etcPth/piler.conf rm $etcPth/piler.conf
cp $etcPth/piler.conf.bak $etcPth/piler.conf cp $etcPth/piler.conf.bak $etcPth/piler.conf
fi fi
sed -i "s/default_retention_days=.*/default_retention_days=$DEFAULT_RETENTION_DAYS/" $etcPth/piler.conf sed -i "s/default_retention_days=.*/default_retention_days=$DEFAULT_RETENTION_DAYS/" $etcPth/piler.conf
@ -298,9 +306,9 @@ echo
cd $installPth cd $installPth
if [ $COMPOSE_VERSION = native ]; then if [ $COMPOSE_VERSION = native ]; then
docker compose restart piler docker compose restart piler
else else
docker-compose restart piler docker-compose restart piler
fi fi
echo echo
@ -309,14 +317,16 @@ echo "${greenBold} Piler Update completed successfully"
echo "${greenBold}${HLINE}${normal}" echo "${greenBold}${HLINE}${normal}"
echo echo
echo echo
echo "${greenBold}${HLINE}" echo "${greenBold}${HLINE}${HLINE_SMALL}"
if [ "$USE_LETSENCRYPT" = "yes" ]; then if [ "$USE_LETSENCRYPT" = "yes" ]; then
echo "${greenBold}you can start in your Browser with https://${PILER_DOMAIN}!" echo "${greenBold}you can start in your Browser with https://${PILER_DOMAIN}!"
else else
echo "${greenBold}you can start in your Browser with:" echo "${greenBold}you can start in your Browser with:"
echo "${greenBold}http://${PILER_DOMAIN} or http://local-ip" echo "${greenBold}http://${PILER_DOMAIN} or http://local-ip"
fi fi
echo "${greenBold}${HLINE}${normal}"
echo "${greenBold}${HLINE}${HLINE_SMALL}${normal}"
echo echo
echo "${blue}${HLINE}" echo "${blue}${HLINE}"