friendica/docker
2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2025-03-31 12:21:06 +02:00
Code Issues Releases Wiki Activity

Fixing travis tests

Browse source 
- Fixing output verbosity
This commit is contained in:
Philipp Holzer 2018-05-20 22:33:29 +02:00
parent 22a3d48c9f
commit ce49a5994b
No known key found for this signature in database
GPG key ID: 58160D7D6AF942B6
6 changed files with 42 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
develop/apache/entrypoint.sh
View file

@ -26,7 +26,7 @@ version_greater() {
console() { console() {
cd $WORKDIR cd $WORKDIR
# Todo starting a php-executable without quoting the arguments seems not secure (but is the only way it works) # Todo starting a php-executable without quoting the arguments seems not secure (but is the only way it works)
sh -c "php $WORKDIR/bin/console.php $@" > /dev/null 2&>1 sh -c "php $WORKDIR/bin/console.php $@"
} }
# If there is no VERSION file or the command is "update", (re-)install Friendica # If there is no VERSION file or the command is "update", (re-)install Friendica
@ -41,10 +41,12 @@ if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
# Removing the whole directory first # Removing the whole directory first
rm -fr $SOURCEDIR/friendica rm -fr $SOURCEDIR/friendica
sh -c "git clone -q -b $FRIENDICA_VERSION https://github.com/friendica/friendica $SOURCEDIR/friendica" > /dev/null 2&>1 sh -c "git clone -q -b $FRIENDICA_VERSION https://github.com/friendica/friendica $SOURCEDIR/friendica"
chmod 777 $SOURCEDIR/friendica/view/smarty3 if [ -f $SOURCEDIR/friendica/view/smarty3 ]; then
chmod 777 $SOURCEDIR/friendica/view/smarty3
fi
mkdir $SOURCEDIR/friendica/addon mkdir $SOURCEDIR/friendica/addon
sh -c "git clone -q -b $FRIENDICA_ADDONS https://github.com/friendica/friendica-addons $SOURCEDIR/friendica/addon" > /dev/null 2&>1 sh -c "git clone -q -b $FRIENDICA_ADDONS https://github.com/friendica/friendica-addons $SOURCEDIR/friendica/addon"
fi fi
image_version="0.0.0.0" image_version="0.0.0.0"
@ -76,7 +78,7 @@ if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
exit 1 exit 1
fi fi
run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar install -d $WORKDIR" > /dev/null 2&>1 run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar install -d $WORKDIR"
fi fi
if [ ! -f $WORKDIR/.htconfig.php ] && if [ ! -f $WORKDIR/.htconfig.php ] &&
@ -89,10 +91,7 @@ if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
# TODO Workaround because of a strange permission issue # TODO Workaround because of a strange permission issue
rm -fr $WORKDIR/view/smarty3/compiled rm -fr $WORKDIR/view/smarty3/compiled
elif [ "$1" = "update" ]; then elif [ "$1" = "update" ]; then
echo "Updating Friendica"
console "dbstructure update" console "dbstructure update"
exit 0
fi fi
fi fi
fi fi

15
develop/fpm-alpine/entrypoint.sh
View file

@ -26,7 +26,7 @@ version_greater() {
console() { console() {
cd $WORKDIR cd $WORKDIR
# Todo starting a php-executable without quoting the arguments seems not secure (but is the only way it works) # Todo starting a php-executable without quoting the arguments seems not secure (but is the only way it works)
sh -c "php $WORKDIR/bin/console.php $@" > /dev/null 2&>1 sh -c "php $WORKDIR/bin/console.php $@"
} }
# If there is no VERSION file or the command is "update", (re-)install Friendica # If there is no VERSION file or the command is "update", (re-)install Friendica
@ -41,10 +41,12 @@ if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
# Removing the whole directory first # Removing the whole directory first
rm -fr $SOURCEDIR/friendica rm -fr $SOURCEDIR/friendica
sh -c "git clone -q -b $FRIENDICA_VERSION https://github.com/friendica/friendica $SOURCEDIR/friendica" > /dev/null 2&>1 sh -c "git clone -q -b $FRIENDICA_VERSION https://github.com/friendica/friendica $SOURCEDIR/friendica"
chmod 777 $SOURCEDIR/friendica/view/smarty3 if [ -f $SOURCEDIR/friendica/view/smarty3 ]; then
chmod 777 $SOURCEDIR/friendica/view/smarty3
fi
mkdir $SOURCEDIR/friendica/addon mkdir $SOURCEDIR/friendica/addon
sh -c "git clone -q -b $FRIENDICA_ADDONS https://github.com/friendica/friendica-addons $SOURCEDIR/friendica/addon" > /dev/null 2&>1 sh -c "git clone -q -b $FRIENDICA_ADDONS https://github.com/friendica/friendica-addons $SOURCEDIR/friendica/addon"
fi fi
image_version="0.0.0.0" image_version="0.0.0.0"
@ -76,7 +78,7 @@ if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
exit 1 exit 1
fi fi
run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar install -d $WORKDIR" > /dev/null 2&>1 run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar install -d $WORKDIR"
fi fi
if [ ! -f $WORKDIR/.htconfig.php ] && if [ ! -f $WORKDIR/.htconfig.php ] &&
@ -89,10 +91,7 @@ if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
# TODO Workaround because of a strange permission issue # TODO Workaround because of a strange permission issue
rm -fr $WORKDIR/view/smarty3/compiled rm -fr $WORKDIR/view/smarty3/compiled
elif [ "$1" = "update" ]; then elif [ "$1" = "update" ]; then
echo "Updating Friendica"
console "dbstructure update" console "dbstructure update"
exit 0
fi fi
fi fi
fi fi

15
develop/fpm/entrypoint.sh
View file

@ -26,7 +26,7 @@ version_greater() {
console() { console() {
cd $WORKDIR cd $WORKDIR
# Todo starting a php-executable without quoting the arguments seems not secure (but is the only way it works) # Todo starting a php-executable without quoting the arguments seems not secure (but is the only way it works)
sh -c "php $WORKDIR/bin/console.php $@" > /dev/null 2&>1 sh -c "php $WORKDIR/bin/console.php $@"
} }
# If there is no VERSION file or the command is "update", (re-)install Friendica # If there is no VERSION file or the command is "update", (re-)install Friendica
@ -41,10 +41,12 @@ if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
# Removing the whole directory first # Removing the whole directory first
rm -fr $SOURCEDIR/friendica rm -fr $SOURCEDIR/friendica
sh -c "git clone -q -b $FRIENDICA_VERSION https://github.com/friendica/friendica $SOURCEDIR/friendica" > /dev/null 2&>1 sh -c "git clone -q -b $FRIENDICA_VERSION https://github.com/friendica/friendica $SOURCEDIR/friendica"
chmod 777 $SOURCEDIR/friendica/view/smarty3 if [ -f $SOURCEDIR/friendica/view/smarty3 ]; then
chmod 777 $SOURCEDIR/friendica/view/smarty3
fi
mkdir $SOURCEDIR/friendica/addon mkdir $SOURCEDIR/friendica/addon
sh -c "git clone -q -b $FRIENDICA_ADDONS https://github.com/friendica/friendica-addons $SOURCEDIR/friendica/addon" > /dev/null 2&>1 sh -c "git clone -q -b $FRIENDICA_ADDONS https://github.com/friendica/friendica-addons $SOURCEDIR/friendica/addon"
fi fi
image_version="0.0.0.0" image_version="0.0.0.0"
@ -76,7 +78,7 @@ if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
exit 1 exit 1
fi fi
run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar install -d $WORKDIR" > /dev/null 2&>1 run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar install -d $WORKDIR"
fi fi
if [ ! -f $WORKDIR/.htconfig.php ] && if [ ! -f $WORKDIR/.htconfig.php ] &&
@ -89,10 +91,7 @@ if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
# TODO Workaround because of a strange permission issue # TODO Workaround because of a strange permission issue
rm -fr $WORKDIR/view/smarty3/compiled rm -fr $WORKDIR/view/smarty3/compiled
elif [ "$1" = "update" ]; then elif [ "$1" = "update" ]; then
echo "Updating Friendica"
console "dbstructure update" console "dbstructure update"
exit 0
fi fi
fi fi
fi fi

15
stable/apache/entrypoint.sh
View file

@ -26,7 +26,7 @@ version_greater() {
console() { console() {
cd $WORKDIR cd $WORKDIR
# Todo starting a php-executable without quoting the arguments seems not secure (but is the only way it works) # Todo starting a php-executable without quoting the arguments seems not secure (but is the only way it works)
sh -c "php $WORKDIR/bin/console.php $@" > /dev/null 2&>1 sh -c "php $WORKDIR/bin/console.php $@"
} }
# If there is no VERSION file or the command is "update", (re-)install Friendica # If there is no VERSION file or the command is "update", (re-)install Friendica
@ -41,10 +41,12 @@ if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
# Removing the whole directory first # Removing the whole directory first
rm -fr $SOURCEDIR/friendica rm -fr $SOURCEDIR/friendica
sh -c "git clone -q -b $FRIENDICA_VERSION https://github.com/friendica/friendica $SOURCEDIR/friendica" > /dev/null 2&>1 sh -c "git clone -q -b $FRIENDICA_VERSION https://github.com/friendica/friendica $SOURCEDIR/friendica"
chmod 777 $SOURCEDIR/friendica/view/smarty3 if [ -f $SOURCEDIR/friendica/view/smarty3 ]; then
chmod 777 $SOURCEDIR/friendica/view/smarty3
fi
mkdir $SOURCEDIR/friendica/addon mkdir $SOURCEDIR/friendica/addon
sh -c "git clone -q -b $FRIENDICA_ADDONS https://github.com/friendica/friendica-addons $SOURCEDIR/friendica/addon" > /dev/null 2&>1 sh -c "git clone -q -b $FRIENDICA_ADDONS https://github.com/friendica/friendica-addons $SOURCEDIR/friendica/addon"
fi fi
image_version="0.0.0.0" image_version="0.0.0.0"
@ -76,7 +78,7 @@ if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
exit 1 exit 1
fi fi
run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar install -d $WORKDIR" > /dev/null 2&>1 run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar install -d $WORKDIR"
fi fi
if [ ! -f $WORKDIR/.htconfig.php ] && if [ ! -f $WORKDIR/.htconfig.php ] &&
@ -89,10 +91,7 @@ if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
# TODO Workaround because of a strange permission issue # TODO Workaround because of a strange permission issue
rm -fr $WORKDIR/view/smarty3/compiled rm -fr $WORKDIR/view/smarty3/compiled
elif [ "$1" = "update" ]; then elif [ "$1" = "update" ]; then
echo "Updating Friendica"
console "dbstructure update" console "dbstructure update"
exit 0
fi fi
fi fi
fi fi

15
stable/fpm-alpine/entrypoint.sh
View file

@ -26,7 +26,7 @@ version_greater() {
console() { console() {
cd $WORKDIR cd $WORKDIR
# Todo starting a php-executable without quoting the arguments seems not secure (but is the only way it works) # Todo starting a php-executable without quoting the arguments seems not secure (but is the only way it works)
sh -c "php $WORKDIR/bin/console.php $@" > /dev/null 2&>1 sh -c "php $WORKDIR/bin/console.php $@"
} }
# If there is no VERSION file or the command is "update", (re-)install Friendica # If there is no VERSION file or the command is "update", (re-)install Friendica
@ -41,10 +41,12 @@ if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
# Removing the whole directory first # Removing the whole directory first
rm -fr $SOURCEDIR/friendica rm -fr $SOURCEDIR/friendica
sh -c "git clone -q -b $FRIENDICA_VERSION https://github.com/friendica/friendica $SOURCEDIR/friendica" > /dev/null 2&>1 sh -c "git clone -q -b $FRIENDICA_VERSION https://github.com/friendica/friendica $SOURCEDIR/friendica"
chmod 777 $SOURCEDIR/friendica/view/smarty3 if [ -f $SOURCEDIR/friendica/view/smarty3 ]; then
chmod 777 $SOURCEDIR/friendica/view/smarty3
fi
mkdir $SOURCEDIR/friendica/addon mkdir $SOURCEDIR/friendica/addon
sh -c "git clone -q -b $FRIENDICA_ADDONS https://github.com/friendica/friendica-addons $SOURCEDIR/friendica/addon" > /dev/null 2&>1 sh -c "git clone -q -b $FRIENDICA_ADDONS https://github.com/friendica/friendica-addons $SOURCEDIR/friendica/addon"
fi fi
image_version="0.0.0.0" image_version="0.0.0.0"
@ -76,7 +78,7 @@ if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
exit 1 exit 1
fi fi
run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar install -d $WORKDIR" > /dev/null 2&>1 run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar install -d $WORKDIR"
fi fi
if [ ! -f $WORKDIR/.htconfig.php ] && if [ ! -f $WORKDIR/.htconfig.php ] &&
@ -89,10 +91,7 @@ if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
# TODO Workaround because of a strange permission issue # TODO Workaround because of a strange permission issue
rm -fr $WORKDIR/view/smarty3/compiled rm -fr $WORKDIR/view/smarty3/compiled
elif [ "$1" = "update" ]; then elif [ "$1" = "update" ]; then
echo "Updating Friendica"
console "dbstructure update" console "dbstructure update"
exit 0
fi fi
fi fi
fi fi

15
stable/fpm/entrypoint.sh
View file

@ -26,7 +26,7 @@ version_greater() {
console() { console() {
cd $WORKDIR cd $WORKDIR
# Todo starting a php-executable without quoting the arguments seems not secure (but is the only way it works) # Todo starting a php-executable without quoting the arguments seems not secure (but is the only way it works)
sh -c "php $WORKDIR/bin/console.php $@" > /dev/null 2&>1 sh -c "php $WORKDIR/bin/console.php $@"
} }
# If there is no VERSION file or the command is "update", (re-)install Friendica # If there is no VERSION file or the command is "update", (re-)install Friendica
@ -41,10 +41,12 @@ if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
# Removing the whole directory first # Removing the whole directory first
rm -fr $SOURCEDIR/friendica rm -fr $SOURCEDIR/friendica
sh -c "git clone -q -b $FRIENDICA_VERSION https://github.com/friendica/friendica $SOURCEDIR/friendica" > /dev/null 2&>1 sh -c "git clone -q -b $FRIENDICA_VERSION https://github.com/friendica/friendica $SOURCEDIR/friendica"
chmod 777 $SOURCEDIR/friendica/view/smarty3 if [ -f $SOURCEDIR/friendica/view/smarty3 ]; then
chmod 777 $SOURCEDIR/friendica/view/smarty3
fi
mkdir $SOURCEDIR/friendica/addon mkdir $SOURCEDIR/friendica/addon
sh -c "git clone -q -b $FRIENDICA_ADDONS https://github.com/friendica/friendica-addons $SOURCEDIR/friendica/addon" > /dev/null 2&>1 sh -c "git clone -q -b $FRIENDICA_ADDONS https://github.com/friendica/friendica-addons $SOURCEDIR/friendica/addon"
fi fi
image_version="0.0.0.0" image_version="0.0.0.0"
@ -76,7 +78,7 @@ if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
exit 1 exit 1
fi fi
run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar install -d $WORKDIR" > /dev/null 2&>1 run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar install -d $WORKDIR"
fi fi
if [ ! -f $WORKDIR/.htconfig.php ] && if [ ! -f $WORKDIR/.htconfig.php ] &&
@ -89,10 +91,7 @@ if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
# TODO Workaround because of a strange permission issue # TODO Workaround because of a strange permission issue
rm -fr $WORKDIR/view/smarty3/compiled rm -fr $WORKDIR/view/smarty3/compiled
elif [ "$1" = "update" ]; then elif [ "$1" = "update" ]; then
echo "Updating Friendica"
console "dbstructure update" console "dbstructure update"
exit 0
fi fi
fi fi
fi fi