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

(simatec) Beta v0.9.1

Browse source
This commit is contained in:
simatec 2023-01-23 21:37:49 +01:00
parent eb50915835
commit aa3549059e
4 changed files with 32 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -145,6 +145,10 @@ To leave the container on the console you have to execute 2x `exit`.
## Changelog ## Changelog
### 0.9.1 (23.01.2023)
* (simatec) Piler Docker Hub added
* (simatec) Fix Automatic Import
### 0.9.0 (23.01.2023) ### 0.9.0 (23.01.2023)
* (simatec) Piler Build added * (simatec) Piler Build added
* (simatec) Piler Import Option added * (simatec) Piler Import Option added

4
build/build.sh
View file

@ -12,10 +12,10 @@ chmod a+x start.sh
. ./build.conf . ./build.conf
# set Piler Version # set Piler Version
sed -i 's/PILER_VERSION=.*/PILER_VERSION="'$PILER_VERSION'"/g' ../piler.conf #sed -i 's/PILER_VERSION=.*/PILER_VERSION="'$PILER_VERSION'"/g' ../piler.conf
# set Maria-DB Version # set Maria-DB Version
sed -i 's/MARIA_DB_VERSION=.*/MARIA_DB_VERSION="'$MARIA_DB_VERSION'"/g' ../piler.conf #sed -i 's/MARIA_DB_VERSION=.*/MARIA_DB_VERSION="'$MARIA_DB_VERSION'"/g' ../piler.conf
# Package Download # Package Download

11
install-piler.sh
View file

@ -287,10 +287,10 @@ if [ ! -f $installPth/.env ]; then
fi fi
# Build Piler # Build Piler
cd $buildPth #cd $buildPth
echo echo "${greenBold}Start Piler-Build...${normal}" && \ #echo "${greenBold}Start Piler-Build...${normal}" && \
bash build.sh && \ #bash build.sh && \
echo "${greenBold}Piler-Build finish${normal}" #echo "${greenBold}Piler-Build finish${normal}"
if [ -f $installPth/docker-compose.yml ]; then if [ -f $installPth/docker-compose.yml ]; then
rm $installPth/docker-compose.yml rm $installPth/docker-compose.yml
@ -428,6 +428,8 @@ cat >> $etcPth/config-site.php <<EOF
EOF EOF
if [ "$AUTO_IMPORT" = true ]; then if [ "$AUTO_IMPORT" = true ]; then
chown root:crontab $cronPth/piler
cat >> $cronPth/piler <<EOF cat >> $cronPth/piler <<EOF
### Piler import added by Piler-Installer ### Piler import added by Piler-Installer
*/5 * * * * /usr/libexec/piler/import.sh */5 * * * * /usr/libexec/piler/import.sh
@ -488,7 +490,6 @@ else
docker-compose restart piler docker-compose restart piler
fi fi
echo echo
echo "${greenBold}${HLINE}" echo "${greenBold}${HLINE}"
echo "${greenBold} Piler install completed successfully" echo "${greenBold} Piler install completed successfully"

31
update.sh
View file

@ -110,13 +110,6 @@ configPth="$installPth/config"
etcPth="/var/lib/docker/volumes/piler-docker_piler_etc/_data" etcPth="/var/lib/docker/volumes/piler-docker_piler_etc/_data"
buildPth="$installPth/build" buildPth="$installPth/build"
# config load
. ./piler.conf
if [ ! -f $installPth/.env ]; then
ln -s ./piler.conf .env
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
@ -156,6 +149,22 @@ for buildUpdate in start.sh build.sh Dockerfile build.conf; do
echo echo
done done
# build config load
. .$buildPth/build.conf
# set Piler Version
sed -i 's/PILER_VERSION=.*/PILER_VERSION="'$PILER_VERSION'"/g' ./piler.conf
# set Maria-DB Version
sed -i 's/MARIA_DB_VERSION=.*/MARIA_DB_VERSION="'$MARIA_DB_VERSION'"/g' ./piler.conf
# config load
. ./piler.conf
if [ ! -f $installPth/.env ]; then
ln -s ./piler.conf .env
fi
# old docker stop # old docker stop
cd $installPth cd $installPth
@ -181,10 +190,10 @@ if [ ! -f $etcPth/MANTICORE ]; then
fi fi
# Build Piler # Build Piler
cd $buildPth #cd $buildPth
echo "${greenBold}Start Piler-Build...${normal}" && \ #echo "${greenBold}Start Piler-Build...${normal}" && \
bash build.sh && \ #bash build.sh && \
echo "${greenBold}Piler-Build finish${normal}" #echo "${greenBold}Piler-Build finish${normal}"
# Copy docker-compose.yml # Copy docker-compose.yml
if [ "$USE_LETSENCRYPT" = "yes" ]; then if [ "$USE_LETSENCRYPT" = "yes" ]; then