mirror of
https://github.com/friendica/docker
synced 2024-12-28 20:19:34 +01:00
Fixed cron.sh & update
- restored script `friendica` for update & wrapper purpose - fixed `cron.sh`
This commit is contained in:
parent
ce49a5994b
commit
1362cc34ca
25 changed files with 1387 additions and 662 deletions
21
README.md
21
README.md
|
|
@ -130,12 +130,29 @@ You have to pull the latest image from the hub (`docker pull friendica`).
|
||||||
|
|
||||||
## Updating develop
|
## Updating develop
|
||||||
You don't need to pull the image for each commit in [friendica](https://github.com/friendica/friendica/).
|
You don't need to pull the image for each commit in [friendica](https://github.com/friendica/friendica/).
|
||||||
Instead you can just update your node with executing `update` on the node.
|
Instead you can just update your node with executing `friendica update` on the node.
|
||||||
Example:
|
Example:
|
||||||
```console
|
```console
|
||||||
$ docker exec -ti friendica_running_node update
|
$ docker exec -ti friendica_running_node friendica update
|
||||||
```
|
```
|
||||||
It will clone the latest Friendica version and copy it to your working directory.
|
It will clone the latest Friendica version and copy it to your working directory.
|
||||||
|
|
||||||
|
# The `friendica` CLI
|
||||||
|
|
||||||
|
To make the usage of the Dockerimages smooth, we created a little CLI.
|
||||||
|
It wraps the common commands for Friendica and adds new commands.
|
||||||
|
|
||||||
|
You can call it with
|
||||||
|
```console
|
||||||
|
$ docker exec -ti friendica_running_node friendica <command> \
|
||||||
|
```
|
||||||
|
|
||||||
|
Commands:
|
||||||
|
- `console` Executes an command in the Friendica console (`bin/console.php` wrapper)
|
||||||
|
- `composer` Executes the composer.phar executable for Friendica (`bin/composer.phar` wrapper)
|
||||||
|
- `install` Installs Friendica on a empty environment (gets called automatically during first start)
|
||||||
|
- `update` Updates Friendica on a **existing** environment
|
||||||
|
|
||||||
|
|
||||||
# Questions / Issues
|
# Questions / Issues
|
||||||
If you got any questions or problems using the image, please visit our [Github Repository](https://github.com/friendica/docker) and write an issue.
|
If you got any questions or problems using the image, please visit our [Github Repository](https://github.com/friendica/docker) and write an issue.
|
||||||
|
|
@ -11,15 +11,11 @@ RUN set -ex; \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
rsync \
|
rsync \
|
||||||
bzip2 \
|
bzip2 \
|
||||||
busybox-static \
|
|
||||||
git \
|
git \
|
||||||
# For mail() support
|
# For mail() support
|
||||||
sendmail \
|
sendmail \
|
||||||
; \
|
; \
|
||||||
rm -rf /var/lib/apt/lists/*; \
|
rm -rf /var/lib/apt/lists/*;
|
||||||
\
|
|
||||||
mkdir -p /var/spool/cron/crontabs; \
|
|
||||||
echo '*/10 * * * * cd /var/www/html && php -f bin/worker.php' > /var/spool/cron/crontabs/www-data
|
|
||||||
|
|
||||||
# install the PHP extensions we need
|
# install the PHP extensions we need
|
||||||
# see https://friendi.ca/resources/requirements/
|
# see https://friendi.ca/resources/requirements/
|
||||||
|
|
@ -102,9 +98,11 @@ RUN {\
|
||||||
ENV FRIENDICA_VERSION develop
|
ENV FRIENDICA_VERSION develop
|
||||||
ENV ADDONS_VERSION develop
|
ENV ADDONS_VERSION develop
|
||||||
|
|
||||||
|
COPY bin/* /usr/local/bin/
|
||||||
COPY config/* /usr/src/config/
|
COPY config/* /usr/src/config/
|
||||||
COPY *.sh /
|
COPY *.sh /
|
||||||
RUN chmod +x /*.sh
|
RUN chmod +x /*.sh
|
||||||
|
RUN chmod +x /usr/local/bin/*
|
||||||
|
|
||||||
ENTRYPOINT ["/entrypoint.sh"]
|
ENTRYPOINT ["/entrypoint.sh"]
|
||||||
CMD ["apache2-foreground"]
|
CMD ["apache2-foreground"]
|
||||||
212
develop/apache/bin/friendica
Normal file
212
develop/apache/bin/friendica
Normal file
|
|
@ -0,0 +1,212 @@
|
||||||
|
#!/bin/sh
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
FRIENDICA_VERSION=${FRIENDICA_VERSION:-develop}
|
||||||
|
FRIENDICA_ADDONS=${FRIENDICA_ADDONS:-develop}
|
||||||
|
AUTOINSTALL=${AUTOINSTALL:-false}
|
||||||
|
|
||||||
|
SOURCEDIR=/usr/src
|
||||||
|
WORKDIR=/var/www/html
|
||||||
|
|
||||||
|
# change delimiter for arrays from whitespaces to newlines (so we can pass strings with whitespaces)
|
||||||
|
#IFS=\r\n
|
||||||
|
|
||||||
|
VERBOSE=1
|
||||||
|
for arg; do
|
||||||
|
case "$arg" in
|
||||||
|
-q|--quit)
|
||||||
|
if [ "$VERBOSE" -eq "2" ]; then
|
||||||
|
echo 'You cannot use verbose and quiet at the same time'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
VERBOSE=0
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
-v|--verbose)
|
||||||
|
if [ "$VERBOSE" -eq "0" ]; then
|
||||||
|
echo 'You cannot use verbose and quiet at the same time'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
VERBOSE=2
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
# run an command with the www-data user
|
||||||
|
run_as() {
|
||||||
|
if [ "$(id -u)" = 0 ]; then
|
||||||
|
su - www-data -s /bin/sh -c "$1"
|
||||||
|
else
|
||||||
|
sh -c "$1"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# log event
|
||||||
|
log() {
|
||||||
|
currVerb=1
|
||||||
|
if [ $# -eq 2 ]; then
|
||||||
|
currVerb=$2
|
||||||
|
fi
|
||||||
|
if [ "$VERBOSE" -ge "$currVerb" ]; then
|
||||||
|
echo "$1"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# checks if the the first parameter is greater than the second parameter
|
||||||
|
version_greater() {
|
||||||
|
[ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 | head -n 1)" != "$1" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
# clones the whole develop branch (Friendica and Addons)
|
||||||
|
clone_develop() {
|
||||||
|
dir="${1:-$SOURCEDIR}"
|
||||||
|
friendica="${2:-$FRIENDICA_VERSION}"
|
||||||
|
addons="${3:-$FRIENDICA_ADDONS}"
|
||||||
|
|
||||||
|
log 'Cloning Friendica '\'$friendica\'' with Addons '\'$addons\'' into '\'$dir\'
|
||||||
|
|
||||||
|
# Removing the whole directory first
|
||||||
|
rm -fr $dir/friendica
|
||||||
|
|
||||||
|
sh -c "git clone -b ${friendica} https://github.com/friendica/friendica ${dir}/friendica"
|
||||||
|
mkdir $dir/friendica/addon
|
||||||
|
sh -c "git clone -b ${addons} https://github.com/friendica/friendica-addons ${dir}/friendica/addon"
|
||||||
|
}
|
||||||
|
|
||||||
|
# help of this shell script
|
||||||
|
friendica_help() {
|
||||||
|
echo "Usage: friendica <command> [<args>]"
|
||||||
|
echo ""
|
||||||
|
echo "Commands:"
|
||||||
|
echo " console Executes an command in the Friendica console"
|
||||||
|
echo " composer Executes the composer.phar executable for Friendica"
|
||||||
|
echo " install Installs Friendica"
|
||||||
|
echo " update Updates Friendica"
|
||||||
|
exit 0
|
||||||
|
}
|
||||||
|
|
||||||
|
# executes the Friendica console
|
||||||
|
console() {
|
||||||
|
cd $WORKDIR
|
||||||
|
# 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 $@"
|
||||||
|
}
|
||||||
|
|
||||||
|
# executes the composer.phar binary of Friendica
|
||||||
|
composer() {
|
||||||
|
if [ -f $WORKDIR/bin/composer.phar ]; then
|
||||||
|
run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar $@ -d $WORKDIR"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
copy_sources() {
|
||||||
|
installed_version="0.0.0.0"
|
||||||
|
if [ -f ${WORKDIR}/VERSION ]; then
|
||||||
|
installed_version="$(cat ${WORKDIR}/VERSION)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||||
|
clone_develop
|
||||||
|
fi
|
||||||
|
|
||||||
|
image_version="0.0.0.0"
|
||||||
|
if [ -f $SOURCEDIR/friendica/VERSION ]; then
|
||||||
|
image_version="$(cat $SOURCEDIR/friendica/VERSION)"
|
||||||
|
else
|
||||||
|
# no given installation and not using the developer branch => nothing to do
|
||||||
|
log 'Friendica command '\'$1\'' failed, because of no version found', 0
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if version_greater "$installed_version" "$image_version"; then
|
||||||
|
log 'Can'\''t copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ('$image_version')', 0
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if version_greater "$image_version" "$installed_version"; then
|
||||||
|
if [ "$(id -u)" = 0 ]; then
|
||||||
|
rsync_options="-rlDog --chown=www-data:root"
|
||||||
|
else
|
||||||
|
rsync_options="-rlD"
|
||||||
|
fi
|
||||||
|
|
||||||
|
log 'Copying Friendica sources ('$image_version') from '\'$SOURCEDIR'/friendica'\'' to '\'$WORKDIR\'
|
||||||
|
rsync $rsync_options --delete --exclude='.git' $SOURCEDIR/friendica/ $WORKDIR/
|
||||||
|
|
||||||
|
if [ -f $WORKDIR/view/smarty3 ]; then
|
||||||
|
chmod 777 $WORKDIR/view/smarty3
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# install Friendica
|
||||||
|
install() {
|
||||||
|
if [ -f ${WORKDIR}/VERSION ]; then
|
||||||
|
# If there is a given installation of Friendica and we should not update it => exit
|
||||||
|
# We have to explicit update Friendica to avoid breaking something
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
copy_sources
|
||||||
|
|
||||||
|
log 'Installing Friendica'
|
||||||
|
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||||
|
composer "install"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -f ${WORKDIR}/.htconfig.php ] &&
|
||||||
|
[ -f ${SOURCEDIR}/config/htconfig.php ] &&
|
||||||
|
"$AUTOINSTALL" == "true"; then
|
||||||
|
run_as "cp ${SOURCEDIR}/config/htconfig.php ${WORKDIR}/html/.htconfig.php"
|
||||||
|
# TODO Pull Request for dba Change
|
||||||
|
run_as "sed -i 's/\s+\sDNS_CNAME//g' ${WORKDIR}/include/dba.php"
|
||||||
|
console "autoinstall -f .htconfig.php"
|
||||||
|
# TODO Workaround because of a strange permission issue
|
||||||
|
rm -fr ${WORKDIR}/view/smarty3/compiled
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
update() {
|
||||||
|
if [ ! -f ${WORKDIR}/VERSION ]; then
|
||||||
|
# We want to update a given installation
|
||||||
|
# if there is no installation, exit
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
copy_sources
|
||||||
|
|
||||||
|
log 'Upgrading Friendica'
|
||||||
|
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||||
|
composer "install"
|
||||||
|
fi
|
||||||
|
console "dbstructure update"
|
||||||
|
}
|
||||||
|
|
||||||
|
sendmail() {
|
||||||
|
if [ ! -f /etc/init.d/sendmail ]; then
|
||||||
|
# If sendmail isn't installed, exit this method
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
line=$(head -n 1 /etc/hosts)
|
||||||
|
line2=$(echo $line | awk '{print $2}')
|
||||||
|
echo "$line $line2.localdomain" >> /etc/hosts
|
||||||
|
|
||||||
|
log 'Starting sendmail for Mail-Support'
|
||||||
|
nohup /etc/init.d/sendmail start > /dev/null 2>&1 &
|
||||||
|
}
|
||||||
|
|
||||||
|
if [ $# -eq 0 ]; then
|
||||||
|
friendica_help
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
install) shift; install "$@";;
|
||||||
|
update) shift; update "$@" ;;
|
||||||
|
console) shift; console "$@" ;;
|
||||||
|
composer) shift; composer "$@" ;;
|
||||||
|
sendmail) shift; sendmail "$@" ;;
|
||||||
|
*) friendica_help ;;
|
||||||
|
esac
|
||||||
|
|
@ -1,4 +1,14 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
exec busybox crond -f -l 0 -L /dev/stdout
|
trap "break;exit" SIGHUP SIGINT SIGTERM
|
||||||
|
|
||||||
|
while [ ! -f /var/www/html/.htconfig.php ]; do
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
|
||||||
|
while true; do
|
||||||
|
cd /var/www/html
|
||||||
|
php -f /var/www/html/bin/worker.php
|
||||||
|
sleep 10m
|
||||||
|
done
|
||||||
|
|
@ -1,109 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
FRIENDICA_VERSION=${FRIENDICA_VERSION:-develop}
|
friendica install -q
|
||||||
FRIENDICA_ADDONS=${FRIENDICA_ADDONS:-develop}
|
friendica sendmail -q
|
||||||
AUTOINSTALL=${AUTOINSTALL:-false}
|
|
||||||
|
|
||||||
SOURCEDIR=/usr/src
|
|
||||||
WORKDIR=/var/www/html
|
|
||||||
|
|
||||||
# run an command with the www-data user
|
|
||||||
run_as() {
|
|
||||||
if [ "$(id -u)" = 0 ]; then
|
|
||||||
su - www-data -s /bin/sh -c "$1"
|
|
||||||
else
|
|
||||||
sh -c "$1"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# checks if the the first parameter is greater than the second parameter
|
|
||||||
version_greater() {
|
|
||||||
[ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 | head -n 1)" != "$1" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
# executes the Friendica console
|
|
||||||
console() {
|
|
||||||
cd $WORKDIR
|
|
||||||
# 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 $@"
|
|
||||||
}
|
|
||||||
|
|
||||||
# If there is no VERSION file or the command is "update", (re-)install Friendica
|
|
||||||
if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
|
|
||||||
|
|
||||||
installed_version="0.0.0.0"
|
|
||||||
if [ -f $WORKDIR/VERSION ]; then
|
|
||||||
installed_version="$(cat $WORKDIR/VERSION)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
|
||||||
# Removing the whole directory first
|
|
||||||
rm -fr $SOURCEDIR/friendica
|
|
||||||
|
|
||||||
sh -c "git clone -q -b $FRIENDICA_VERSION https://github.com/friendica/friendica $SOURCEDIR/friendica"
|
|
||||||
if [ -f $SOURCEDIR/friendica/view/smarty3 ]; then
|
|
||||||
chmod 777 $SOURCEDIR/friendica/view/smarty3
|
|
||||||
fi
|
|
||||||
mkdir $SOURCEDIR/friendica/addon
|
|
||||||
sh -c "git clone -q -b $FRIENDICA_ADDONS https://github.com/friendica/friendica-addons $SOURCEDIR/friendica/addon"
|
|
||||||
fi
|
|
||||||
|
|
||||||
image_version="0.0.0.0"
|
|
||||||
if [ -f $SOURCEDIR/friendica/VERSION ]; then
|
|
||||||
image_version="$(cat $SOURCEDIR/friendica/VERSION)"
|
|
||||||
else
|
|
||||||
# no given installation and not using the developer branch => nothing to do
|
|
||||||
echo "Friendica command '$1' failed, because no version found"
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
|
||||||
echo "Can't copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ($image_version)"
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if version_greater "$image_version" "$installed_version"; then
|
|
||||||
if [ "$(id -u)" = 0 ]; then
|
|
||||||
rsync_options="-rlDog --chown www-data:root"
|
|
||||||
else
|
|
||||||
rsync_options="-rlD"
|
|
||||||
fi
|
|
||||||
|
|
||||||
rsync $rsync_options --delete --exclude='.git/' ${SOURCEDIR}/friendica/ ${WORKDIR}/
|
|
||||||
|
|
||||||
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
|
||||||
if [ ! -f ${WORKDIR}/bin/composer.phar ]; then
|
|
||||||
echo "no composer found"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar install -d $WORKDIR"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f $WORKDIR/.htconfig.php ] &&
|
|
||||||
[ -f $SOURCEDIR/config/htconfig.php ] &&
|
|
||||||
"$AUTOINSTALL" == "true"; then
|
|
||||||
run_as "cp $SOURCEDIR/config/htconfig.php $WORKDIR/html/.htconfig.php"
|
|
||||||
# TODO Pull Request for dba Change
|
|
||||||
run_as "sed -i 's/\s+\sDNS_CNAME//g' $WORKDIR/include/dba.php"
|
|
||||||
console "autoinstall -f .htconfig.php"
|
|
||||||
# TODO Workaround because of a strange permission issue
|
|
||||||
rm -fr $WORKDIR/view/smarty3/compiled
|
|
||||||
elif [ "$1" = "update" ]; then
|
|
||||||
console "dbstructure update"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Start sendmail if you find it
|
|
||||||
if [ -f /etc/init.d/sendmail ]; then
|
|
||||||
|
|
||||||
line=$(head -n 1 /etc/hosts)
|
|
||||||
line2=$(echo $line | awk '{print $2}')
|
|
||||||
echo "$line $line2.localdomain" >> /etc/hosts
|
|
||||||
|
|
||||||
nohup /etc/init.d/sendmail start > /dev/null 2>&1 &
|
|
||||||
fi
|
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
@ -9,11 +9,7 @@ RUN set -ex; \
|
||||||
\
|
\
|
||||||
apk add --no-cache \
|
apk add --no-cache \
|
||||||
rsync \
|
rsync \
|
||||||
git \
|
git;
|
||||||
; \
|
|
||||||
\
|
|
||||||
rm /var/spool/cron/crontabs/root; \
|
|
||||||
echo '*/10 * * * * cd /var/www/html && php -f bin/worker.php' > /var/spool/cron/crontabs/www-data
|
|
||||||
|
|
||||||
# install the PHP extensions we need
|
# install the PHP extensions we need
|
||||||
# see https://friendi.ca/resources/requirements/
|
# see https://friendi.ca/resources/requirements/
|
||||||
|
|
@ -80,9 +76,11 @@ RUN {\
|
||||||
ENV FRIENDICA_VERSION develop
|
ENV FRIENDICA_VERSION develop
|
||||||
ENV ADDONS_VERSION develop
|
ENV ADDONS_VERSION develop
|
||||||
|
|
||||||
|
COPY bin/* /usr/local/bin/
|
||||||
COPY config/* /usr/src/config/
|
COPY config/* /usr/src/config/
|
||||||
COPY *.sh /
|
COPY *.sh /
|
||||||
RUN chmod +x /*.sh
|
RUN chmod +x /*.sh
|
||||||
|
RUN chmod +x /usr/local/bin/*
|
||||||
|
|
||||||
ENTRYPOINT ["/entrypoint.sh"]
|
ENTRYPOINT ["/entrypoint.sh"]
|
||||||
CMD ["php-fpm"]
|
CMD ["php-fpm"]
|
||||||
212
develop/fpm-alpine/bin/friendica
Normal file
212
develop/fpm-alpine/bin/friendica
Normal file
|
|
@ -0,0 +1,212 @@
|
||||||
|
#!/bin/sh
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
FRIENDICA_VERSION=${FRIENDICA_VERSION:-develop}
|
||||||
|
FRIENDICA_ADDONS=${FRIENDICA_ADDONS:-develop}
|
||||||
|
AUTOINSTALL=${AUTOINSTALL:-false}
|
||||||
|
|
||||||
|
SOURCEDIR=/usr/src
|
||||||
|
WORKDIR=/var/www/html
|
||||||
|
|
||||||
|
# change delimiter for arrays from whitespaces to newlines (so we can pass strings with whitespaces)
|
||||||
|
#IFS=\r\n
|
||||||
|
|
||||||
|
VERBOSE=1
|
||||||
|
for arg; do
|
||||||
|
case "$arg" in
|
||||||
|
-q|--quit)
|
||||||
|
if [ "$VERBOSE" -eq "2" ]; then
|
||||||
|
echo 'You cannot use verbose and quiet at the same time'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
VERBOSE=0
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
-v|--verbose)
|
||||||
|
if [ "$VERBOSE" -eq "0" ]; then
|
||||||
|
echo 'You cannot use verbose and quiet at the same time'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
VERBOSE=2
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
# run an command with the www-data user
|
||||||
|
run_as() {
|
||||||
|
if [ "$(id -u)" = 0 ]; then
|
||||||
|
su - www-data -s /bin/sh -c "$1"
|
||||||
|
else
|
||||||
|
sh -c "$1"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# log event
|
||||||
|
log() {
|
||||||
|
currVerb=1
|
||||||
|
if [ $# -eq 2 ]; then
|
||||||
|
currVerb=$2
|
||||||
|
fi
|
||||||
|
if [ "$VERBOSE" -ge "$currVerb" ]; then
|
||||||
|
echo "$1"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# checks if the the first parameter is greater than the second parameter
|
||||||
|
version_greater() {
|
||||||
|
[ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 | head -n 1)" != "$1" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
# clones the whole develop branch (Friendica and Addons)
|
||||||
|
clone_develop() {
|
||||||
|
dir="${1:-$SOURCEDIR}"
|
||||||
|
friendica="${2:-$FRIENDICA_VERSION}"
|
||||||
|
addons="${3:-$FRIENDICA_ADDONS}"
|
||||||
|
|
||||||
|
log 'Cloning Friendica '\'$friendica\'' with Addons '\'$addons\'' into '\'$dir\'
|
||||||
|
|
||||||
|
# Removing the whole directory first
|
||||||
|
rm -fr $dir/friendica
|
||||||
|
|
||||||
|
sh -c "git clone -b ${friendica} https://github.com/friendica/friendica ${dir}/friendica"
|
||||||
|
mkdir $dir/friendica/addon
|
||||||
|
sh -c "git clone -b ${addons} https://github.com/friendica/friendica-addons ${dir}/friendica/addon"
|
||||||
|
}
|
||||||
|
|
||||||
|
# help of this shell script
|
||||||
|
friendica_help() {
|
||||||
|
echo "Usage: friendica <command> [<args>]"
|
||||||
|
echo ""
|
||||||
|
echo "Commands:"
|
||||||
|
echo " console Executes an command in the Friendica console"
|
||||||
|
echo " composer Executes the composer.phar executable for Friendica"
|
||||||
|
echo " install Installs Friendica"
|
||||||
|
echo " update Updates Friendica"
|
||||||
|
exit 0
|
||||||
|
}
|
||||||
|
|
||||||
|
# executes the Friendica console
|
||||||
|
console() {
|
||||||
|
cd $WORKDIR
|
||||||
|
# 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 $@"
|
||||||
|
}
|
||||||
|
|
||||||
|
# executes the composer.phar binary of Friendica
|
||||||
|
composer() {
|
||||||
|
if [ -f $WORKDIR/bin/composer.phar ]; then
|
||||||
|
run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar $@ -d $WORKDIR"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
copy_sources() {
|
||||||
|
installed_version="0.0.0.0"
|
||||||
|
if [ -f ${WORKDIR}/VERSION ]; then
|
||||||
|
installed_version="$(cat ${WORKDIR}/VERSION)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||||
|
clone_develop
|
||||||
|
fi
|
||||||
|
|
||||||
|
image_version="0.0.0.0"
|
||||||
|
if [ -f $SOURCEDIR/friendica/VERSION ]; then
|
||||||
|
image_version="$(cat $SOURCEDIR/friendica/VERSION)"
|
||||||
|
else
|
||||||
|
# no given installation and not using the developer branch => nothing to do
|
||||||
|
log 'Friendica command '\'$1\'' failed, because of no version found', 0
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if version_greater "$installed_version" "$image_version"; then
|
||||||
|
log 'Can'\''t copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ('$image_version')', 0
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if version_greater "$image_version" "$installed_version"; then
|
||||||
|
if [ "$(id -u)" = 0 ]; then
|
||||||
|
rsync_options="-rlDog --chown=www-data:root"
|
||||||
|
else
|
||||||
|
rsync_options="-rlD"
|
||||||
|
fi
|
||||||
|
|
||||||
|
log 'Copying Friendica sources ('$image_version') from '\'$SOURCEDIR'/friendica'\'' to '\'$WORKDIR\'
|
||||||
|
rsync $rsync_options --delete --exclude='.git' $SOURCEDIR/friendica/ $WORKDIR/
|
||||||
|
|
||||||
|
if [ -f $WORKDIR/view/smarty3 ]; then
|
||||||
|
chmod 777 $WORKDIR/view/smarty3
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# install Friendica
|
||||||
|
install() {
|
||||||
|
if [ -f ${WORKDIR}/VERSION ]; then
|
||||||
|
# If there is a given installation of Friendica and we should not update it => exit
|
||||||
|
# We have to explicit update Friendica to avoid breaking something
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
copy_sources
|
||||||
|
|
||||||
|
log 'Installing Friendica'
|
||||||
|
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||||
|
composer "install"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -f ${WORKDIR}/.htconfig.php ] &&
|
||||||
|
[ -f ${SOURCEDIR}/config/htconfig.php ] &&
|
||||||
|
"$AUTOINSTALL" == "true"; then
|
||||||
|
run_as "cp ${SOURCEDIR}/config/htconfig.php ${WORKDIR}/html/.htconfig.php"
|
||||||
|
# TODO Pull Request for dba Change
|
||||||
|
run_as "sed -i 's/\s+\sDNS_CNAME//g' ${WORKDIR}/include/dba.php"
|
||||||
|
console "autoinstall -f .htconfig.php"
|
||||||
|
# TODO Workaround because of a strange permission issue
|
||||||
|
rm -fr ${WORKDIR}/view/smarty3/compiled
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
update() {
|
||||||
|
if [ ! -f ${WORKDIR}/VERSION ]; then
|
||||||
|
# We want to update a given installation
|
||||||
|
# if there is no installation, exit
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
copy_sources
|
||||||
|
|
||||||
|
log 'Upgrading Friendica'
|
||||||
|
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||||
|
composer "install"
|
||||||
|
fi
|
||||||
|
console "dbstructure update"
|
||||||
|
}
|
||||||
|
|
||||||
|
sendmail() {
|
||||||
|
if [ ! -f /etc/init.d/sendmail ]; then
|
||||||
|
# If sendmail isn't installed, exit this method
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
line=$(head -n 1 /etc/hosts)
|
||||||
|
line2=$(echo $line | awk '{print $2}')
|
||||||
|
echo "$line $line2.localdomain" >> /etc/hosts
|
||||||
|
|
||||||
|
log 'Starting sendmail for Mail-Support'
|
||||||
|
nohup /etc/init.d/sendmail start > /dev/null 2>&1 &
|
||||||
|
}
|
||||||
|
|
||||||
|
if [ $# -eq 0 ]; then
|
||||||
|
friendica_help
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
install) shift; install "$@";;
|
||||||
|
update) shift; update "$@" ;;
|
||||||
|
console) shift; console "$@" ;;
|
||||||
|
composer) shift; composer "$@" ;;
|
||||||
|
sendmail) shift; sendmail "$@" ;;
|
||||||
|
*) friendica_help ;;
|
||||||
|
esac
|
||||||
|
|
@ -1,4 +1,14 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
exec busybox crond -f -l 0 -L /dev/stdout
|
trap "break;exit" SIGHUP SIGINT SIGTERM
|
||||||
|
|
||||||
|
while [ ! -f /var/www/html/.htconfig.php ]; do
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
|
||||||
|
while true; do
|
||||||
|
cd /var/www/html
|
||||||
|
php -f /var/www/html/bin/worker.php
|
||||||
|
sleep 10m
|
||||||
|
done
|
||||||
|
|
@ -1,109 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
FRIENDICA_VERSION=${FRIENDICA_VERSION:-develop}
|
friendica install -q
|
||||||
FRIENDICA_ADDONS=${FRIENDICA_ADDONS:-develop}
|
friendica sendmail -q
|
||||||
AUTOINSTALL=${AUTOINSTALL:-false}
|
|
||||||
|
|
||||||
SOURCEDIR=/usr/src
|
|
||||||
WORKDIR=/var/www/html
|
|
||||||
|
|
||||||
# run an command with the www-data user
|
|
||||||
run_as() {
|
|
||||||
if [ "$(id -u)" = 0 ]; then
|
|
||||||
su - www-data -s /bin/sh -c "$1"
|
|
||||||
else
|
|
||||||
sh -c "$1"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# checks if the the first parameter is greater than the second parameter
|
|
||||||
version_greater() {
|
|
||||||
[ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 | head -n 1)" != "$1" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
# executes the Friendica console
|
|
||||||
console() {
|
|
||||||
cd $WORKDIR
|
|
||||||
# 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 $@"
|
|
||||||
}
|
|
||||||
|
|
||||||
# If there is no VERSION file or the command is "update", (re-)install Friendica
|
|
||||||
if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
|
|
||||||
|
|
||||||
installed_version="0.0.0.0"
|
|
||||||
if [ -f $WORKDIR/VERSION ]; then
|
|
||||||
installed_version="$(cat $WORKDIR/VERSION)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
|
||||||
# Removing the whole directory first
|
|
||||||
rm -fr $SOURCEDIR/friendica
|
|
||||||
|
|
||||||
sh -c "git clone -q -b $FRIENDICA_VERSION https://github.com/friendica/friendica $SOURCEDIR/friendica"
|
|
||||||
if [ -f $SOURCEDIR/friendica/view/smarty3 ]; then
|
|
||||||
chmod 777 $SOURCEDIR/friendica/view/smarty3
|
|
||||||
fi
|
|
||||||
mkdir $SOURCEDIR/friendica/addon
|
|
||||||
sh -c "git clone -q -b $FRIENDICA_ADDONS https://github.com/friendica/friendica-addons $SOURCEDIR/friendica/addon"
|
|
||||||
fi
|
|
||||||
|
|
||||||
image_version="0.0.0.0"
|
|
||||||
if [ -f $SOURCEDIR/friendica/VERSION ]; then
|
|
||||||
image_version="$(cat $SOURCEDIR/friendica/VERSION)"
|
|
||||||
else
|
|
||||||
# no given installation and not using the developer branch => nothing to do
|
|
||||||
echo "Friendica command '$1' failed, because no version found"
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
|
||||||
echo "Can't copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ($image_version)"
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if version_greater "$image_version" "$installed_version"; then
|
|
||||||
if [ "$(id -u)" = 0 ]; then
|
|
||||||
rsync_options="-rlDog --chown www-data:root"
|
|
||||||
else
|
|
||||||
rsync_options="-rlD"
|
|
||||||
fi
|
|
||||||
|
|
||||||
rsync $rsync_options --delete --exclude='.git/' ${SOURCEDIR}/friendica/ ${WORKDIR}/
|
|
||||||
|
|
||||||
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
|
||||||
if [ ! -f ${WORKDIR}/bin/composer.phar ]; then
|
|
||||||
echo "no composer found"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar install -d $WORKDIR"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f $WORKDIR/.htconfig.php ] &&
|
|
||||||
[ -f $SOURCEDIR/config/htconfig.php ] &&
|
|
||||||
"$AUTOINSTALL" == "true"; then
|
|
||||||
run_as "cp $SOURCEDIR/config/htconfig.php $WORKDIR/html/.htconfig.php"
|
|
||||||
# TODO Pull Request for dba Change
|
|
||||||
run_as "sed -i 's/\s+\sDNS_CNAME//g' $WORKDIR/include/dba.php"
|
|
||||||
console "autoinstall -f .htconfig.php"
|
|
||||||
# TODO Workaround because of a strange permission issue
|
|
||||||
rm -fr $WORKDIR/view/smarty3/compiled
|
|
||||||
elif [ "$1" = "update" ]; then
|
|
||||||
console "dbstructure update"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Start sendmail if you find it
|
|
||||||
if [ -f /etc/init.d/sendmail ]; then
|
|
||||||
|
|
||||||
line=$(head -n 1 /etc/hosts)
|
|
||||||
line2=$(echo $line | awk '{print $2}')
|
|
||||||
echo "$line $line2.localdomain" >> /etc/hosts
|
|
||||||
|
|
||||||
nohup /etc/init.d/sendmail start > /dev/null 2>&1 &
|
|
||||||
fi
|
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
@ -11,15 +11,11 @@ RUN set -ex; \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
rsync \
|
rsync \
|
||||||
bzip2 \
|
bzip2 \
|
||||||
busybox-static \
|
|
||||||
git \
|
git \
|
||||||
# For mail() support
|
# For mail() support
|
||||||
sendmail \
|
sendmail \
|
||||||
; \
|
; \
|
||||||
rm -rf /var/lib/apt/lists/*; \
|
rm -rf /var/lib/apt/lists/*;
|
||||||
\
|
|
||||||
mkdir -p /var/spool/cron/crontabs; \
|
|
||||||
echo '*/10 * * * * cd /var/www/html && php -f bin/worker.php' > /var/spool/cron/crontabs/www-data
|
|
||||||
|
|
||||||
# install the PHP extensions we need
|
# install the PHP extensions we need
|
||||||
# see https://friendi.ca/resources/requirements/
|
# see https://friendi.ca/resources/requirements/
|
||||||
|
|
@ -93,9 +89,11 @@ RUN {\
|
||||||
ENV FRIENDICA_VERSION develop
|
ENV FRIENDICA_VERSION develop
|
||||||
ENV ADDONS_VERSION develop
|
ENV ADDONS_VERSION develop
|
||||||
|
|
||||||
|
COPY bin/* /usr/local/bin/
|
||||||
COPY config/* /usr/src/config/
|
COPY config/* /usr/src/config/
|
||||||
COPY *.sh /
|
COPY *.sh /
|
||||||
RUN chmod +x /*.sh
|
RUN chmod +x /*.sh
|
||||||
|
RUN chmod +x /usr/local/bin/*
|
||||||
|
|
||||||
ENTRYPOINT ["/entrypoint.sh"]
|
ENTRYPOINT ["/entrypoint.sh"]
|
||||||
CMD ["php-fpm"]
|
CMD ["php-fpm"]
|
||||||
212
develop/fpm/bin/friendica
Normal file
212
develop/fpm/bin/friendica
Normal file
|
|
@ -0,0 +1,212 @@
|
||||||
|
#!/bin/sh
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
FRIENDICA_VERSION=${FRIENDICA_VERSION:-develop}
|
||||||
|
FRIENDICA_ADDONS=${FRIENDICA_ADDONS:-develop}
|
||||||
|
AUTOINSTALL=${AUTOINSTALL:-false}
|
||||||
|
|
||||||
|
SOURCEDIR=/usr/src
|
||||||
|
WORKDIR=/var/www/html
|
||||||
|
|
||||||
|
# change delimiter for arrays from whitespaces to newlines (so we can pass strings with whitespaces)
|
||||||
|
#IFS=\r\n
|
||||||
|
|
||||||
|
VERBOSE=1
|
||||||
|
for arg; do
|
||||||
|
case "$arg" in
|
||||||
|
-q|--quit)
|
||||||
|
if [ "$VERBOSE" -eq "2" ]; then
|
||||||
|
echo 'You cannot use verbose and quiet at the same time'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
VERBOSE=0
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
-v|--verbose)
|
||||||
|
if [ "$VERBOSE" -eq "0" ]; then
|
||||||
|
echo 'You cannot use verbose and quiet at the same time'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
VERBOSE=2
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
# run an command with the www-data user
|
||||||
|
run_as() {
|
||||||
|
if [ "$(id -u)" = 0 ]; then
|
||||||
|
su - www-data -s /bin/sh -c "$1"
|
||||||
|
else
|
||||||
|
sh -c "$1"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# log event
|
||||||
|
log() {
|
||||||
|
currVerb=1
|
||||||
|
if [ $# -eq 2 ]; then
|
||||||
|
currVerb=$2
|
||||||
|
fi
|
||||||
|
if [ "$VERBOSE" -ge "$currVerb" ]; then
|
||||||
|
echo "$1"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# checks if the the first parameter is greater than the second parameter
|
||||||
|
version_greater() {
|
||||||
|
[ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 | head -n 1)" != "$1" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
# clones the whole develop branch (Friendica and Addons)
|
||||||
|
clone_develop() {
|
||||||
|
dir="${1:-$SOURCEDIR}"
|
||||||
|
friendica="${2:-$FRIENDICA_VERSION}"
|
||||||
|
addons="${3:-$FRIENDICA_ADDONS}"
|
||||||
|
|
||||||
|
log 'Cloning Friendica '\'$friendica\'' with Addons '\'$addons\'' into '\'$dir\'
|
||||||
|
|
||||||
|
# Removing the whole directory first
|
||||||
|
rm -fr $dir/friendica
|
||||||
|
|
||||||
|
sh -c "git clone -b ${friendica} https://github.com/friendica/friendica ${dir}/friendica"
|
||||||
|
mkdir $dir/friendica/addon
|
||||||
|
sh -c "git clone -b ${addons} https://github.com/friendica/friendica-addons ${dir}/friendica/addon"
|
||||||
|
}
|
||||||
|
|
||||||
|
# help of this shell script
|
||||||
|
friendica_help() {
|
||||||
|
echo "Usage: friendica <command> [<args>]"
|
||||||
|
echo ""
|
||||||
|
echo "Commands:"
|
||||||
|
echo " console Executes an command in the Friendica console"
|
||||||
|
echo " composer Executes the composer.phar executable for Friendica"
|
||||||
|
echo " install Installs Friendica"
|
||||||
|
echo " update Updates Friendica"
|
||||||
|
exit 0
|
||||||
|
}
|
||||||
|
|
||||||
|
# executes the Friendica console
|
||||||
|
console() {
|
||||||
|
cd $WORKDIR
|
||||||
|
# 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 $@"
|
||||||
|
}
|
||||||
|
|
||||||
|
# executes the composer.phar binary of Friendica
|
||||||
|
composer() {
|
||||||
|
if [ -f $WORKDIR/bin/composer.phar ]; then
|
||||||
|
run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar $@ -d $WORKDIR"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
copy_sources() {
|
||||||
|
installed_version="0.0.0.0"
|
||||||
|
if [ -f ${WORKDIR}/VERSION ]; then
|
||||||
|
installed_version="$(cat ${WORKDIR}/VERSION)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||||
|
clone_develop
|
||||||
|
fi
|
||||||
|
|
||||||
|
image_version="0.0.0.0"
|
||||||
|
if [ -f $SOURCEDIR/friendica/VERSION ]; then
|
||||||
|
image_version="$(cat $SOURCEDIR/friendica/VERSION)"
|
||||||
|
else
|
||||||
|
# no given installation and not using the developer branch => nothing to do
|
||||||
|
log 'Friendica command '\'$1\'' failed, because of no version found', 0
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if version_greater "$installed_version" "$image_version"; then
|
||||||
|
log 'Can'\''t copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ('$image_version')', 0
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if version_greater "$image_version" "$installed_version"; then
|
||||||
|
if [ "$(id -u)" = 0 ]; then
|
||||||
|
rsync_options="-rlDog --chown=www-data:root"
|
||||||
|
else
|
||||||
|
rsync_options="-rlD"
|
||||||
|
fi
|
||||||
|
|
||||||
|
log 'Copying Friendica sources ('$image_version') from '\'$SOURCEDIR'/friendica'\'' to '\'$WORKDIR\'
|
||||||
|
rsync $rsync_options --delete --exclude='.git' $SOURCEDIR/friendica/ $WORKDIR/
|
||||||
|
|
||||||
|
if [ -f $WORKDIR/view/smarty3 ]; then
|
||||||
|
chmod 777 $WORKDIR/view/smarty3
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# install Friendica
|
||||||
|
install() {
|
||||||
|
if [ -f ${WORKDIR}/VERSION ]; then
|
||||||
|
# If there is a given installation of Friendica and we should not update it => exit
|
||||||
|
# We have to explicit update Friendica to avoid breaking something
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
copy_sources
|
||||||
|
|
||||||
|
log 'Installing Friendica'
|
||||||
|
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||||
|
composer "install"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -f ${WORKDIR}/.htconfig.php ] &&
|
||||||
|
[ -f ${SOURCEDIR}/config/htconfig.php ] &&
|
||||||
|
"$AUTOINSTALL" == "true"; then
|
||||||
|
run_as "cp ${SOURCEDIR}/config/htconfig.php ${WORKDIR}/html/.htconfig.php"
|
||||||
|
# TODO Pull Request for dba Change
|
||||||
|
run_as "sed -i 's/\s+\sDNS_CNAME//g' ${WORKDIR}/include/dba.php"
|
||||||
|
console "autoinstall -f .htconfig.php"
|
||||||
|
# TODO Workaround because of a strange permission issue
|
||||||
|
rm -fr ${WORKDIR}/view/smarty3/compiled
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
update() {
|
||||||
|
if [ ! -f ${WORKDIR}/VERSION ]; then
|
||||||
|
# We want to update a given installation
|
||||||
|
# if there is no installation, exit
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
copy_sources
|
||||||
|
|
||||||
|
log 'Upgrading Friendica'
|
||||||
|
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||||
|
composer "install"
|
||||||
|
fi
|
||||||
|
console "dbstructure update"
|
||||||
|
}
|
||||||
|
|
||||||
|
sendmail() {
|
||||||
|
if [ ! -f /etc/init.d/sendmail ]; then
|
||||||
|
# If sendmail isn't installed, exit this method
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
line=$(head -n 1 /etc/hosts)
|
||||||
|
line2=$(echo $line | awk '{print $2}')
|
||||||
|
echo "$line $line2.localdomain" >> /etc/hosts
|
||||||
|
|
||||||
|
log 'Starting sendmail for Mail-Support'
|
||||||
|
nohup /etc/init.d/sendmail start > /dev/null 2>&1 &
|
||||||
|
}
|
||||||
|
|
||||||
|
if [ $# -eq 0 ]; then
|
||||||
|
friendica_help
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
install) shift; install "$@";;
|
||||||
|
update) shift; update "$@" ;;
|
||||||
|
console) shift; console "$@" ;;
|
||||||
|
composer) shift; composer "$@" ;;
|
||||||
|
sendmail) shift; sendmail "$@" ;;
|
||||||
|
*) friendica_help ;;
|
||||||
|
esac
|
||||||
|
|
@ -1,4 +1,14 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
exec busybox crond -f -l 0 -L /dev/stdout
|
trap "break;exit" SIGHUP SIGINT SIGTERM
|
||||||
|
|
||||||
|
while [ ! -f /var/www/html/.htconfig.php ]; do
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
|
||||||
|
while true; do
|
||||||
|
cd /var/www/html
|
||||||
|
php -f /var/www/html/bin/worker.php
|
||||||
|
sleep 10m
|
||||||
|
done
|
||||||
|
|
@ -1,109 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
FRIENDICA_VERSION=${FRIENDICA_VERSION:-develop}
|
friendica install -q
|
||||||
FRIENDICA_ADDONS=${FRIENDICA_ADDONS:-develop}
|
friendica sendmail -q
|
||||||
AUTOINSTALL=${AUTOINSTALL:-false}
|
|
||||||
|
|
||||||
SOURCEDIR=/usr/src
|
|
||||||
WORKDIR=/var/www/html
|
|
||||||
|
|
||||||
# run an command with the www-data user
|
|
||||||
run_as() {
|
|
||||||
if [ "$(id -u)" = 0 ]; then
|
|
||||||
su - www-data -s /bin/sh -c "$1"
|
|
||||||
else
|
|
||||||
sh -c "$1"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# checks if the the first parameter is greater than the second parameter
|
|
||||||
version_greater() {
|
|
||||||
[ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 | head -n 1)" != "$1" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
# executes the Friendica console
|
|
||||||
console() {
|
|
||||||
cd $WORKDIR
|
|
||||||
# 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 $@"
|
|
||||||
}
|
|
||||||
|
|
||||||
# If there is no VERSION file or the command is "update", (re-)install Friendica
|
|
||||||
if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
|
|
||||||
|
|
||||||
installed_version="0.0.0.0"
|
|
||||||
if [ -f $WORKDIR/VERSION ]; then
|
|
||||||
installed_version="$(cat $WORKDIR/VERSION)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
|
||||||
# Removing the whole directory first
|
|
||||||
rm -fr $SOURCEDIR/friendica
|
|
||||||
|
|
||||||
sh -c "git clone -q -b $FRIENDICA_VERSION https://github.com/friendica/friendica $SOURCEDIR/friendica"
|
|
||||||
if [ -f $SOURCEDIR/friendica/view/smarty3 ]; then
|
|
||||||
chmod 777 $SOURCEDIR/friendica/view/smarty3
|
|
||||||
fi
|
|
||||||
mkdir $SOURCEDIR/friendica/addon
|
|
||||||
sh -c "git clone -q -b $FRIENDICA_ADDONS https://github.com/friendica/friendica-addons $SOURCEDIR/friendica/addon"
|
|
||||||
fi
|
|
||||||
|
|
||||||
image_version="0.0.0.0"
|
|
||||||
if [ -f $SOURCEDIR/friendica/VERSION ]; then
|
|
||||||
image_version="$(cat $SOURCEDIR/friendica/VERSION)"
|
|
||||||
else
|
|
||||||
# no given installation and not using the developer branch => nothing to do
|
|
||||||
echo "Friendica command '$1' failed, because no version found"
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
|
||||||
echo "Can't copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ($image_version)"
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if version_greater "$image_version" "$installed_version"; then
|
|
||||||
if [ "$(id -u)" = 0 ]; then
|
|
||||||
rsync_options="-rlDog --chown www-data:root"
|
|
||||||
else
|
|
||||||
rsync_options="-rlD"
|
|
||||||
fi
|
|
||||||
|
|
||||||
rsync $rsync_options --delete --exclude='.git/' ${SOURCEDIR}/friendica/ ${WORKDIR}/
|
|
||||||
|
|
||||||
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
|
||||||
if [ ! -f ${WORKDIR}/bin/composer.phar ]; then
|
|
||||||
echo "no composer found"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar install -d $WORKDIR"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f $WORKDIR/.htconfig.php ] &&
|
|
||||||
[ -f $SOURCEDIR/config/htconfig.php ] &&
|
|
||||||
"$AUTOINSTALL" == "true"; then
|
|
||||||
run_as "cp $SOURCEDIR/config/htconfig.php $WORKDIR/html/.htconfig.php"
|
|
||||||
# TODO Pull Request for dba Change
|
|
||||||
run_as "sed -i 's/\s+\sDNS_CNAME//g' $WORKDIR/include/dba.php"
|
|
||||||
console "autoinstall -f .htconfig.php"
|
|
||||||
# TODO Workaround because of a strange permission issue
|
|
||||||
rm -fr $WORKDIR/view/smarty3/compiled
|
|
||||||
elif [ "$1" = "update" ]; then
|
|
||||||
console "dbstructure update"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Start sendmail if you find it
|
|
||||||
if [ -f /etc/init.d/sendmail ]; then
|
|
||||||
|
|
||||||
line=$(head -n 1 /etc/hosts)
|
|
||||||
line2=$(echo $line | awk '{print $2}')
|
|
||||||
echo "$line $line2.localdomain" >> /etc/hosts
|
|
||||||
|
|
||||||
nohup /etc/init.d/sendmail start > /dev/null 2>&1 &
|
|
||||||
fi
|
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
@ -11,15 +11,11 @@ RUN set -ex; \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
rsync \
|
rsync \
|
||||||
bzip2 \
|
bzip2 \
|
||||||
busybox-static \
|
|
||||||
git \
|
git \
|
||||||
# For mail() support
|
# For mail() support
|
||||||
sendmail \
|
sendmail \
|
||||||
; \
|
; \
|
||||||
rm -rf /var/lib/apt/lists/*; \
|
rm -rf /var/lib/apt/lists/*;
|
||||||
\
|
|
||||||
mkdir -p /var/spool/cron/crontabs; \
|
|
||||||
echo '*/10 * * * * cd /var/www/html && php -f bin/worker.php' > /var/spool/cron/crontabs/www-data
|
|
||||||
|
|
||||||
# install the PHP extensions we need
|
# install the PHP extensions we need
|
||||||
# see https://friendi.ca/resources/requirements/
|
# see https://friendi.ca/resources/requirements/
|
||||||
|
|
@ -115,9 +111,11 @@ RUN set -ex; \
|
||||||
tar -xzf friendica_addons.tar.gz -C /usr/src/friendica/addon --strip-components=1; \
|
tar -xzf friendica_addons.tar.gz -C /usr/src/friendica/addon --strip-components=1; \
|
||||||
rm friendica_addons.tar.gz;
|
rm friendica_addons.tar.gz;
|
||||||
|
|
||||||
|
COPY bin/* /usr/local/bin/
|
||||||
COPY config/* /usr/src/config/
|
COPY config/* /usr/src/config/
|
||||||
COPY *.sh /
|
COPY *.sh /
|
||||||
RUN chmod +x /*.sh
|
RUN chmod +x /*.sh
|
||||||
|
RUN chmod +x /usr/local/bin/*
|
||||||
|
|
||||||
ENTRYPOINT ["/entrypoint.sh"]
|
ENTRYPOINT ["/entrypoint.sh"]
|
||||||
CMD ["apache2-foreground"]
|
CMD ["apache2-foreground"]
|
||||||
|
|
|
||||||
212
stable/apache/bin/friendica
Normal file
212
stable/apache/bin/friendica
Normal file
|
|
@ -0,0 +1,212 @@
|
||||||
|
#!/bin/sh
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
FRIENDICA_VERSION=${FRIENDICA_VERSION:-develop}
|
||||||
|
FRIENDICA_ADDONS=${FRIENDICA_ADDONS:-develop}
|
||||||
|
AUTOINSTALL=${AUTOINSTALL:-false}
|
||||||
|
|
||||||
|
SOURCEDIR=/usr/src
|
||||||
|
WORKDIR=/var/www/html
|
||||||
|
|
||||||
|
# change delimiter for arrays from whitespaces to newlines (so we can pass strings with whitespaces)
|
||||||
|
#IFS=\r\n
|
||||||
|
|
||||||
|
VERBOSE=1
|
||||||
|
for arg; do
|
||||||
|
case "$arg" in
|
||||||
|
-q|--quit)
|
||||||
|
if [ "$VERBOSE" -eq "2" ]; then
|
||||||
|
echo 'You cannot use verbose and quiet at the same time'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
VERBOSE=0
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
-v|--verbose)
|
||||||
|
if [ "$VERBOSE" -eq "0" ]; then
|
||||||
|
echo 'You cannot use verbose and quiet at the same time'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
VERBOSE=2
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
# run an command with the www-data user
|
||||||
|
run_as() {
|
||||||
|
if [ "$(id -u)" = 0 ]; then
|
||||||
|
su - www-data -s /bin/sh -c "$1"
|
||||||
|
else
|
||||||
|
sh -c "$1"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# log event
|
||||||
|
log() {
|
||||||
|
currVerb=1
|
||||||
|
if [ $# -eq 2 ]; then
|
||||||
|
currVerb=$2
|
||||||
|
fi
|
||||||
|
if [ "$VERBOSE" -ge "$currVerb" ]; then
|
||||||
|
echo "$1"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# checks if the the first parameter is greater than the second parameter
|
||||||
|
version_greater() {
|
||||||
|
[ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 | head -n 1)" != "$1" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
# clones the whole develop branch (Friendica and Addons)
|
||||||
|
clone_develop() {
|
||||||
|
dir="${1:-$SOURCEDIR}"
|
||||||
|
friendica="${2:-$FRIENDICA_VERSION}"
|
||||||
|
addons="${3:-$FRIENDICA_ADDONS}"
|
||||||
|
|
||||||
|
log 'Cloning Friendica '\'$friendica\'' with Addons '\'$addons\'' into '\'$dir\'
|
||||||
|
|
||||||
|
# Removing the whole directory first
|
||||||
|
rm -fr $dir/friendica
|
||||||
|
|
||||||
|
sh -c "git clone -b ${friendica} https://github.com/friendica/friendica ${dir}/friendica"
|
||||||
|
mkdir $dir/friendica/addon
|
||||||
|
sh -c "git clone -b ${addons} https://github.com/friendica/friendica-addons ${dir}/friendica/addon"
|
||||||
|
}
|
||||||
|
|
||||||
|
# help of this shell script
|
||||||
|
friendica_help() {
|
||||||
|
echo "Usage: friendica <command> [<args>]"
|
||||||
|
echo ""
|
||||||
|
echo "Commands:"
|
||||||
|
echo " console Executes an command in the Friendica console"
|
||||||
|
echo " composer Executes the composer.phar executable for Friendica"
|
||||||
|
echo " install Installs Friendica"
|
||||||
|
echo " update Updates Friendica"
|
||||||
|
exit 0
|
||||||
|
}
|
||||||
|
|
||||||
|
# executes the Friendica console
|
||||||
|
console() {
|
||||||
|
cd $WORKDIR
|
||||||
|
# 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 $@"
|
||||||
|
}
|
||||||
|
|
||||||
|
# executes the composer.phar binary of Friendica
|
||||||
|
composer() {
|
||||||
|
if [ -f $WORKDIR/bin/composer.phar ]; then
|
||||||
|
run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar $@ -d $WORKDIR"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
copy_sources() {
|
||||||
|
installed_version="0.0.0.0"
|
||||||
|
if [ -f ${WORKDIR}/VERSION ]; then
|
||||||
|
installed_version="$(cat ${WORKDIR}/VERSION)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||||
|
clone_develop
|
||||||
|
fi
|
||||||
|
|
||||||
|
image_version="0.0.0.0"
|
||||||
|
if [ -f $SOURCEDIR/friendica/VERSION ]; then
|
||||||
|
image_version="$(cat $SOURCEDIR/friendica/VERSION)"
|
||||||
|
else
|
||||||
|
# no given installation and not using the developer branch => nothing to do
|
||||||
|
log 'Friendica command '\'$1\'' failed, because of no version found', 0
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if version_greater "$installed_version" "$image_version"; then
|
||||||
|
log 'Can'\''t copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ('$image_version')', 0
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if version_greater "$image_version" "$installed_version"; then
|
||||||
|
if [ "$(id -u)" = 0 ]; then
|
||||||
|
rsync_options="-rlDog --chown=www-data:root"
|
||||||
|
else
|
||||||
|
rsync_options="-rlD"
|
||||||
|
fi
|
||||||
|
|
||||||
|
log 'Copying Friendica sources ('$image_version') from '\'$SOURCEDIR'/friendica'\'' to '\'$WORKDIR\'
|
||||||
|
rsync $rsync_options --delete --exclude='.git' $SOURCEDIR/friendica/ $WORKDIR/
|
||||||
|
|
||||||
|
if [ -f $WORKDIR/view/smarty3 ]; then
|
||||||
|
chmod 777 $WORKDIR/view/smarty3
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# install Friendica
|
||||||
|
install() {
|
||||||
|
if [ -f ${WORKDIR}/VERSION ]; then
|
||||||
|
# If there is a given installation of Friendica and we should not update it => exit
|
||||||
|
# We have to explicit update Friendica to avoid breaking something
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
copy_sources
|
||||||
|
|
||||||
|
log 'Installing Friendica'
|
||||||
|
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||||
|
composer "install"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -f ${WORKDIR}/.htconfig.php ] &&
|
||||||
|
[ -f ${SOURCEDIR}/config/htconfig.php ] &&
|
||||||
|
"$AUTOINSTALL" == "true"; then
|
||||||
|
run_as "cp ${SOURCEDIR}/config/htconfig.php ${WORKDIR}/html/.htconfig.php"
|
||||||
|
# TODO Pull Request for dba Change
|
||||||
|
run_as "sed -i 's/\s+\sDNS_CNAME//g' ${WORKDIR}/include/dba.php"
|
||||||
|
console "autoinstall -f .htconfig.php"
|
||||||
|
# TODO Workaround because of a strange permission issue
|
||||||
|
rm -fr ${WORKDIR}/view/smarty3/compiled
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
update() {
|
||||||
|
if [ ! -f ${WORKDIR}/VERSION ]; then
|
||||||
|
# We want to update a given installation
|
||||||
|
# if there is no installation, exit
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
copy_sources
|
||||||
|
|
||||||
|
log 'Upgrading Friendica'
|
||||||
|
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||||
|
composer "install"
|
||||||
|
fi
|
||||||
|
console "dbstructure update"
|
||||||
|
}
|
||||||
|
|
||||||
|
sendmail() {
|
||||||
|
if [ ! -f /etc/init.d/sendmail ]; then
|
||||||
|
# If sendmail isn't installed, exit this method
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
line=$(head -n 1 /etc/hosts)
|
||||||
|
line2=$(echo $line | awk '{print $2}')
|
||||||
|
echo "$line $line2.localdomain" >> /etc/hosts
|
||||||
|
|
||||||
|
log 'Starting sendmail for Mail-Support'
|
||||||
|
nohup /etc/init.d/sendmail start > /dev/null 2>&1 &
|
||||||
|
}
|
||||||
|
|
||||||
|
if [ $# -eq 0 ]; then
|
||||||
|
friendica_help
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
install) shift; install "$@";;
|
||||||
|
update) shift; update "$@" ;;
|
||||||
|
console) shift; console "$@" ;;
|
||||||
|
composer) shift; composer "$@" ;;
|
||||||
|
sendmail) shift; sendmail "$@" ;;
|
||||||
|
*) friendica_help ;;
|
||||||
|
esac
|
||||||
|
|
@ -1,4 +1,14 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
exec busybox crond -f -l 0 -L /dev/stdout
|
trap "break;exit" SIGHUP SIGINT SIGTERM
|
||||||
|
|
||||||
|
while [ ! -f /var/www/html/.htconfig.php ]; do
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
|
||||||
|
while true; do
|
||||||
|
cd /var/www/html
|
||||||
|
php -f /var/www/html/bin/worker.php
|
||||||
|
sleep 10m
|
||||||
|
done
|
||||||
|
|
@ -1,109 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
FRIENDICA_VERSION=${FRIENDICA_VERSION:-develop}
|
friendica install -q
|
||||||
FRIENDICA_ADDONS=${FRIENDICA_ADDONS:-develop}
|
friendica sendmail -q
|
||||||
AUTOINSTALL=${AUTOINSTALL:-false}
|
|
||||||
|
|
||||||
SOURCEDIR=/usr/src
|
|
||||||
WORKDIR=/var/www/html
|
|
||||||
|
|
||||||
# run an command with the www-data user
|
|
||||||
run_as() {
|
|
||||||
if [ "$(id -u)" = 0 ]; then
|
|
||||||
su - www-data -s /bin/sh -c "$1"
|
|
||||||
else
|
|
||||||
sh -c "$1"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# checks if the the first parameter is greater than the second parameter
|
|
||||||
version_greater() {
|
|
||||||
[ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 | head -n 1)" != "$1" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
# executes the Friendica console
|
|
||||||
console() {
|
|
||||||
cd $WORKDIR
|
|
||||||
# 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 $@"
|
|
||||||
}
|
|
||||||
|
|
||||||
# If there is no VERSION file or the command is "update", (re-)install Friendica
|
|
||||||
if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
|
|
||||||
|
|
||||||
installed_version="0.0.0.0"
|
|
||||||
if [ -f $WORKDIR/VERSION ]; then
|
|
||||||
installed_version="$(cat $WORKDIR/VERSION)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
|
||||||
# Removing the whole directory first
|
|
||||||
rm -fr $SOURCEDIR/friendica
|
|
||||||
|
|
||||||
sh -c "git clone -q -b $FRIENDICA_VERSION https://github.com/friendica/friendica $SOURCEDIR/friendica"
|
|
||||||
if [ -f $SOURCEDIR/friendica/view/smarty3 ]; then
|
|
||||||
chmod 777 $SOURCEDIR/friendica/view/smarty3
|
|
||||||
fi
|
|
||||||
mkdir $SOURCEDIR/friendica/addon
|
|
||||||
sh -c "git clone -q -b $FRIENDICA_ADDONS https://github.com/friendica/friendica-addons $SOURCEDIR/friendica/addon"
|
|
||||||
fi
|
|
||||||
|
|
||||||
image_version="0.0.0.0"
|
|
||||||
if [ -f $SOURCEDIR/friendica/VERSION ]; then
|
|
||||||
image_version="$(cat $SOURCEDIR/friendica/VERSION)"
|
|
||||||
else
|
|
||||||
# no given installation and not using the developer branch => nothing to do
|
|
||||||
echo "Friendica command '$1' failed, because no version found"
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
|
||||||
echo "Can't copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ($image_version)"
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if version_greater "$image_version" "$installed_version"; then
|
|
||||||
if [ "$(id -u)" = 0 ]; then
|
|
||||||
rsync_options="-rlDog --chown www-data:root"
|
|
||||||
else
|
|
||||||
rsync_options="-rlD"
|
|
||||||
fi
|
|
||||||
|
|
||||||
rsync $rsync_options --delete --exclude='.git/' ${SOURCEDIR}/friendica/ ${WORKDIR}/
|
|
||||||
|
|
||||||
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
|
||||||
if [ ! -f ${WORKDIR}/bin/composer.phar ]; then
|
|
||||||
echo "no composer found"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar install -d $WORKDIR"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f $WORKDIR/.htconfig.php ] &&
|
|
||||||
[ -f $SOURCEDIR/config/htconfig.php ] &&
|
|
||||||
"$AUTOINSTALL" == "true"; then
|
|
||||||
run_as "cp $SOURCEDIR/config/htconfig.php $WORKDIR/html/.htconfig.php"
|
|
||||||
# TODO Pull Request for dba Change
|
|
||||||
run_as "sed -i 's/\s+\sDNS_CNAME//g' $WORKDIR/include/dba.php"
|
|
||||||
console "autoinstall -f .htconfig.php"
|
|
||||||
# TODO Workaround because of a strange permission issue
|
|
||||||
rm -fr $WORKDIR/view/smarty3/compiled
|
|
||||||
elif [ "$1" = "update" ]; then
|
|
||||||
console "dbstructure update"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Start sendmail if you find it
|
|
||||||
if [ -f /etc/init.d/sendmail ]; then
|
|
||||||
|
|
||||||
line=$(head -n 1 /etc/hosts)
|
|
||||||
line2=$(echo $line | awk '{print $2}')
|
|
||||||
echo "$line $line2.localdomain" >> /etc/hosts
|
|
||||||
|
|
||||||
nohup /etc/init.d/sendmail start > /dev/null 2>&1 &
|
|
||||||
fi
|
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
@ -9,11 +9,7 @@ RUN set -ex; \
|
||||||
\
|
\
|
||||||
apk add --no-cache \
|
apk add --no-cache \
|
||||||
rsync \
|
rsync \
|
||||||
git \
|
git;
|
||||||
; \
|
|
||||||
\
|
|
||||||
rm /var/spool/cron/crontabs/root; \
|
|
||||||
echo '*/10 * * * * cd /var/www/html && php -f bin/worker.php' > /var/spool/cron/crontabs/www-data
|
|
||||||
|
|
||||||
# install the PHP extensions we need
|
# install the PHP extensions we need
|
||||||
# see https://friendi.ca/resources/requirements/
|
# see https://friendi.ca/resources/requirements/
|
||||||
|
|
@ -93,9 +89,11 @@ RUN set -ex; \
|
||||||
tar -xzf friendica_addons.tar.gz -C /usr/src/friendica/addon --strip-components=1; \
|
tar -xzf friendica_addons.tar.gz -C /usr/src/friendica/addon --strip-components=1; \
|
||||||
rm friendica_addons.tar.gz;
|
rm friendica_addons.tar.gz;
|
||||||
|
|
||||||
|
COPY bin/* /usr/local/bin/
|
||||||
COPY config/* /usr/src/config/
|
COPY config/* /usr/src/config/
|
||||||
COPY *.sh /
|
COPY *.sh /
|
||||||
RUN chmod +x /*.sh
|
RUN chmod +x /*.sh
|
||||||
|
RUN chmod +x /usr/local/bin/*
|
||||||
|
|
||||||
ENTRYPOINT ["/entrypoint.sh"]
|
ENTRYPOINT ["/entrypoint.sh"]
|
||||||
CMD ["php-fpm"]
|
CMD ["php-fpm"]
|
||||||
212
stable/fpm-alpine/bin/friendica
Normal file
212
stable/fpm-alpine/bin/friendica
Normal file
|
|
@ -0,0 +1,212 @@
|
||||||
|
#!/bin/sh
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
FRIENDICA_VERSION=${FRIENDICA_VERSION:-develop}
|
||||||
|
FRIENDICA_ADDONS=${FRIENDICA_ADDONS:-develop}
|
||||||
|
AUTOINSTALL=${AUTOINSTALL:-false}
|
||||||
|
|
||||||
|
SOURCEDIR=/usr/src
|
||||||
|
WORKDIR=/var/www/html
|
||||||
|
|
||||||
|
# change delimiter for arrays from whitespaces to newlines (so we can pass strings with whitespaces)
|
||||||
|
#IFS=\r\n
|
||||||
|
|
||||||
|
VERBOSE=1
|
||||||
|
for arg; do
|
||||||
|
case "$arg" in
|
||||||
|
-q|--quit)
|
||||||
|
if [ "$VERBOSE" -eq "2" ]; then
|
||||||
|
echo 'You cannot use verbose and quiet at the same time'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
VERBOSE=0
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
-v|--verbose)
|
||||||
|
if [ "$VERBOSE" -eq "0" ]; then
|
||||||
|
echo 'You cannot use verbose and quiet at the same time'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
VERBOSE=2
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
# run an command with the www-data user
|
||||||
|
run_as() {
|
||||||
|
if [ "$(id -u)" = 0 ]; then
|
||||||
|
su - www-data -s /bin/sh -c "$1"
|
||||||
|
else
|
||||||
|
sh -c "$1"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# log event
|
||||||
|
log() {
|
||||||
|
currVerb=1
|
||||||
|
if [ $# -eq 2 ]; then
|
||||||
|
currVerb=$2
|
||||||
|
fi
|
||||||
|
if [ "$VERBOSE" -ge "$currVerb" ]; then
|
||||||
|
echo "$1"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# checks if the the first parameter is greater than the second parameter
|
||||||
|
version_greater() {
|
||||||
|
[ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 | head -n 1)" != "$1" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
# clones the whole develop branch (Friendica and Addons)
|
||||||
|
clone_develop() {
|
||||||
|
dir="${1:-$SOURCEDIR}"
|
||||||
|
friendica="${2:-$FRIENDICA_VERSION}"
|
||||||
|
addons="${3:-$FRIENDICA_ADDONS}"
|
||||||
|
|
||||||
|
log 'Cloning Friendica '\'$friendica\'' with Addons '\'$addons\'' into '\'$dir\'
|
||||||
|
|
||||||
|
# Removing the whole directory first
|
||||||
|
rm -fr $dir/friendica
|
||||||
|
|
||||||
|
sh -c "git clone -b ${friendica} https://github.com/friendica/friendica ${dir}/friendica"
|
||||||
|
mkdir $dir/friendica/addon
|
||||||
|
sh -c "git clone -b ${addons} https://github.com/friendica/friendica-addons ${dir}/friendica/addon"
|
||||||
|
}
|
||||||
|
|
||||||
|
# help of this shell script
|
||||||
|
friendica_help() {
|
||||||
|
echo "Usage: friendica <command> [<args>]"
|
||||||
|
echo ""
|
||||||
|
echo "Commands:"
|
||||||
|
echo " console Executes an command in the Friendica console"
|
||||||
|
echo " composer Executes the composer.phar executable for Friendica"
|
||||||
|
echo " install Installs Friendica"
|
||||||
|
echo " update Updates Friendica"
|
||||||
|
exit 0
|
||||||
|
}
|
||||||
|
|
||||||
|
# executes the Friendica console
|
||||||
|
console() {
|
||||||
|
cd $WORKDIR
|
||||||
|
# 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 $@"
|
||||||
|
}
|
||||||
|
|
||||||
|
# executes the composer.phar binary of Friendica
|
||||||
|
composer() {
|
||||||
|
if [ -f $WORKDIR/bin/composer.phar ]; then
|
||||||
|
run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar $@ -d $WORKDIR"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
copy_sources() {
|
||||||
|
installed_version="0.0.0.0"
|
||||||
|
if [ -f ${WORKDIR}/VERSION ]; then
|
||||||
|
installed_version="$(cat ${WORKDIR}/VERSION)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||||
|
clone_develop
|
||||||
|
fi
|
||||||
|
|
||||||
|
image_version="0.0.0.0"
|
||||||
|
if [ -f $SOURCEDIR/friendica/VERSION ]; then
|
||||||
|
image_version="$(cat $SOURCEDIR/friendica/VERSION)"
|
||||||
|
else
|
||||||
|
# no given installation and not using the developer branch => nothing to do
|
||||||
|
log 'Friendica command '\'$1\'' failed, because of no version found', 0
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if version_greater "$installed_version" "$image_version"; then
|
||||||
|
log 'Can'\''t copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ('$image_version')', 0
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if version_greater "$image_version" "$installed_version"; then
|
||||||
|
if [ "$(id -u)" = 0 ]; then
|
||||||
|
rsync_options="-rlDog --chown=www-data:root"
|
||||||
|
else
|
||||||
|
rsync_options="-rlD"
|
||||||
|
fi
|
||||||
|
|
||||||
|
log 'Copying Friendica sources ('$image_version') from '\'$SOURCEDIR'/friendica'\'' to '\'$WORKDIR\'
|
||||||
|
rsync $rsync_options --delete --exclude='.git' $SOURCEDIR/friendica/ $WORKDIR/
|
||||||
|
|
||||||
|
if [ -f $WORKDIR/view/smarty3 ]; then
|
||||||
|
chmod 777 $WORKDIR/view/smarty3
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# install Friendica
|
||||||
|
install() {
|
||||||
|
if [ -f ${WORKDIR}/VERSION ]; then
|
||||||
|
# If there is a given installation of Friendica and we should not update it => exit
|
||||||
|
# We have to explicit update Friendica to avoid breaking something
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
copy_sources
|
||||||
|
|
||||||
|
log 'Installing Friendica'
|
||||||
|
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||||
|
composer "install"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -f ${WORKDIR}/.htconfig.php ] &&
|
||||||
|
[ -f ${SOURCEDIR}/config/htconfig.php ] &&
|
||||||
|
"$AUTOINSTALL" == "true"; then
|
||||||
|
run_as "cp ${SOURCEDIR}/config/htconfig.php ${WORKDIR}/html/.htconfig.php"
|
||||||
|
# TODO Pull Request for dba Change
|
||||||
|
run_as "sed -i 's/\s+\sDNS_CNAME//g' ${WORKDIR}/include/dba.php"
|
||||||
|
console "autoinstall -f .htconfig.php"
|
||||||
|
# TODO Workaround because of a strange permission issue
|
||||||
|
rm -fr ${WORKDIR}/view/smarty3/compiled
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
update() {
|
||||||
|
if [ ! -f ${WORKDIR}/VERSION ]; then
|
||||||
|
# We want to update a given installation
|
||||||
|
# if there is no installation, exit
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
copy_sources
|
||||||
|
|
||||||
|
log 'Upgrading Friendica'
|
||||||
|
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||||
|
composer "install"
|
||||||
|
fi
|
||||||
|
console "dbstructure update"
|
||||||
|
}
|
||||||
|
|
||||||
|
sendmail() {
|
||||||
|
if [ ! -f /etc/init.d/sendmail ]; then
|
||||||
|
# If sendmail isn't installed, exit this method
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
line=$(head -n 1 /etc/hosts)
|
||||||
|
line2=$(echo $line | awk '{print $2}')
|
||||||
|
echo "$line $line2.localdomain" >> /etc/hosts
|
||||||
|
|
||||||
|
log 'Starting sendmail for Mail-Support'
|
||||||
|
nohup /etc/init.d/sendmail start > /dev/null 2>&1 &
|
||||||
|
}
|
||||||
|
|
||||||
|
if [ $# -eq 0 ]; then
|
||||||
|
friendica_help
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
install) shift; install "$@";;
|
||||||
|
update) shift; update "$@" ;;
|
||||||
|
console) shift; console "$@" ;;
|
||||||
|
composer) shift; composer "$@" ;;
|
||||||
|
sendmail) shift; sendmail "$@" ;;
|
||||||
|
*) friendica_help ;;
|
||||||
|
esac
|
||||||
|
|
@ -1,4 +1,14 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
exec busybox crond -f -l 0 -L /dev/stdout
|
trap "break;exit" SIGHUP SIGINT SIGTERM
|
||||||
|
|
||||||
|
while [ ! -f /var/www/html/.htconfig.php ]; do
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
|
||||||
|
while true; do
|
||||||
|
cd /var/www/html
|
||||||
|
php -f /var/www/html/bin/worker.php
|
||||||
|
sleep 10m
|
||||||
|
done
|
||||||
|
|
@ -1,109 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
FRIENDICA_VERSION=${FRIENDICA_VERSION:-develop}
|
friendica install -q
|
||||||
FRIENDICA_ADDONS=${FRIENDICA_ADDONS:-develop}
|
friendica sendmail -q
|
||||||
AUTOINSTALL=${AUTOINSTALL:-false}
|
|
||||||
|
|
||||||
SOURCEDIR=/usr/src
|
|
||||||
WORKDIR=/var/www/html
|
|
||||||
|
|
||||||
# run an command with the www-data user
|
|
||||||
run_as() {
|
|
||||||
if [ "$(id -u)" = 0 ]; then
|
|
||||||
su - www-data -s /bin/sh -c "$1"
|
|
||||||
else
|
|
||||||
sh -c "$1"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# checks if the the first parameter is greater than the second parameter
|
|
||||||
version_greater() {
|
|
||||||
[ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 | head -n 1)" != "$1" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
# executes the Friendica console
|
|
||||||
console() {
|
|
||||||
cd $WORKDIR
|
|
||||||
# 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 $@"
|
|
||||||
}
|
|
||||||
|
|
||||||
# If there is no VERSION file or the command is "update", (re-)install Friendica
|
|
||||||
if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
|
|
||||||
|
|
||||||
installed_version="0.0.0.0"
|
|
||||||
if [ -f $WORKDIR/VERSION ]; then
|
|
||||||
installed_version="$(cat $WORKDIR/VERSION)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
|
||||||
# Removing the whole directory first
|
|
||||||
rm -fr $SOURCEDIR/friendica
|
|
||||||
|
|
||||||
sh -c "git clone -q -b $FRIENDICA_VERSION https://github.com/friendica/friendica $SOURCEDIR/friendica"
|
|
||||||
if [ -f $SOURCEDIR/friendica/view/smarty3 ]; then
|
|
||||||
chmod 777 $SOURCEDIR/friendica/view/smarty3
|
|
||||||
fi
|
|
||||||
mkdir $SOURCEDIR/friendica/addon
|
|
||||||
sh -c "git clone -q -b $FRIENDICA_ADDONS https://github.com/friendica/friendica-addons $SOURCEDIR/friendica/addon"
|
|
||||||
fi
|
|
||||||
|
|
||||||
image_version="0.0.0.0"
|
|
||||||
if [ -f $SOURCEDIR/friendica/VERSION ]; then
|
|
||||||
image_version="$(cat $SOURCEDIR/friendica/VERSION)"
|
|
||||||
else
|
|
||||||
# no given installation and not using the developer branch => nothing to do
|
|
||||||
echo "Friendica command '$1' failed, because no version found"
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
|
||||||
echo "Can't copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ($image_version)"
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if version_greater "$image_version" "$installed_version"; then
|
|
||||||
if [ "$(id -u)" = 0 ]; then
|
|
||||||
rsync_options="-rlDog --chown www-data:root"
|
|
||||||
else
|
|
||||||
rsync_options="-rlD"
|
|
||||||
fi
|
|
||||||
|
|
||||||
rsync $rsync_options --delete --exclude='.git/' ${SOURCEDIR}/friendica/ ${WORKDIR}/
|
|
||||||
|
|
||||||
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
|
||||||
if [ ! -f ${WORKDIR}/bin/composer.phar ]; then
|
|
||||||
echo "no composer found"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar install -d $WORKDIR"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f $WORKDIR/.htconfig.php ] &&
|
|
||||||
[ -f $SOURCEDIR/config/htconfig.php ] &&
|
|
||||||
"$AUTOINSTALL" == "true"; then
|
|
||||||
run_as "cp $SOURCEDIR/config/htconfig.php $WORKDIR/html/.htconfig.php"
|
|
||||||
# TODO Pull Request for dba Change
|
|
||||||
run_as "sed -i 's/\s+\sDNS_CNAME//g' $WORKDIR/include/dba.php"
|
|
||||||
console "autoinstall -f .htconfig.php"
|
|
||||||
# TODO Workaround because of a strange permission issue
|
|
||||||
rm -fr $WORKDIR/view/smarty3/compiled
|
|
||||||
elif [ "$1" = "update" ]; then
|
|
||||||
console "dbstructure update"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Start sendmail if you find it
|
|
||||||
if [ -f /etc/init.d/sendmail ]; then
|
|
||||||
|
|
||||||
line=$(head -n 1 /etc/hosts)
|
|
||||||
line2=$(echo $line | awk '{print $2}')
|
|
||||||
echo "$line $line2.localdomain" >> /etc/hosts
|
|
||||||
|
|
||||||
nohup /etc/init.d/sendmail start > /dev/null 2>&1 &
|
|
||||||
fi
|
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
@ -11,15 +11,11 @@ RUN set -ex; \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
rsync \
|
rsync \
|
||||||
bzip2 \
|
bzip2 \
|
||||||
busybox-static \
|
|
||||||
git \
|
git \
|
||||||
# For mail() support
|
# For mail() support
|
||||||
sendmail \
|
sendmail \
|
||||||
; \
|
; \
|
||||||
rm -rf /var/lib/apt/lists/*; \
|
rm -rf /var/lib/apt/lists/*;
|
||||||
\
|
|
||||||
mkdir -p /var/spool/cron/crontabs; \
|
|
||||||
echo '*/10 * * * * cd /var/www/html && php -f bin/worker.php' > /var/spool/cron/crontabs/www-data
|
|
||||||
|
|
||||||
# install the PHP extensions we need
|
# install the PHP extensions we need
|
||||||
# see https://friendi.ca/resources/requirements/
|
# see https://friendi.ca/resources/requirements/
|
||||||
|
|
@ -106,9 +102,11 @@ RUN set -ex; \
|
||||||
tar -xzf friendica_addons.tar.gz -C /usr/src/friendica/addon --strip-components=1; \
|
tar -xzf friendica_addons.tar.gz -C /usr/src/friendica/addon --strip-components=1; \
|
||||||
rm friendica_addons.tar.gz;
|
rm friendica_addons.tar.gz;
|
||||||
|
|
||||||
|
COPY bin/* /usr/local/bin/
|
||||||
COPY config/* /usr/src/config/
|
COPY config/* /usr/src/config/
|
||||||
COPY *.sh /
|
COPY *.sh /
|
||||||
RUN chmod +x /*.sh
|
RUN chmod +x /*.sh
|
||||||
|
RUN chmod +x /usr/local/bin/*
|
||||||
|
|
||||||
ENTRYPOINT ["/entrypoint.sh"]
|
ENTRYPOINT ["/entrypoint.sh"]
|
||||||
CMD ["php-fpm"]
|
CMD ["php-fpm"]
|
||||||
|
|
|
||||||
212
stable/fpm/bin/friendica
Normal file
212
stable/fpm/bin/friendica
Normal file
|
|
@ -0,0 +1,212 @@
|
||||||
|
#!/bin/sh
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
FRIENDICA_VERSION=${FRIENDICA_VERSION:-develop}
|
||||||
|
FRIENDICA_ADDONS=${FRIENDICA_ADDONS:-develop}
|
||||||
|
AUTOINSTALL=${AUTOINSTALL:-false}
|
||||||
|
|
||||||
|
SOURCEDIR=/usr/src
|
||||||
|
WORKDIR=/var/www/html
|
||||||
|
|
||||||
|
# change delimiter for arrays from whitespaces to newlines (so we can pass strings with whitespaces)
|
||||||
|
#IFS=\r\n
|
||||||
|
|
||||||
|
VERBOSE=1
|
||||||
|
for arg; do
|
||||||
|
case "$arg" in
|
||||||
|
-q|--quit)
|
||||||
|
if [ "$VERBOSE" -eq "2" ]; then
|
||||||
|
echo 'You cannot use verbose and quiet at the same time'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
VERBOSE=0
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
-v|--verbose)
|
||||||
|
if [ "$VERBOSE" -eq "0" ]; then
|
||||||
|
echo 'You cannot use verbose and quiet at the same time'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
VERBOSE=2
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
# run an command with the www-data user
|
||||||
|
run_as() {
|
||||||
|
if [ "$(id -u)" = 0 ]; then
|
||||||
|
su - www-data -s /bin/sh -c "$1"
|
||||||
|
else
|
||||||
|
sh -c "$1"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# log event
|
||||||
|
log() {
|
||||||
|
currVerb=1
|
||||||
|
if [ $# -eq 2 ]; then
|
||||||
|
currVerb=$2
|
||||||
|
fi
|
||||||
|
if [ "$VERBOSE" -ge "$currVerb" ]; then
|
||||||
|
echo "$1"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# checks if the the first parameter is greater than the second parameter
|
||||||
|
version_greater() {
|
||||||
|
[ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 | head -n 1)" != "$1" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
# clones the whole develop branch (Friendica and Addons)
|
||||||
|
clone_develop() {
|
||||||
|
dir="${1:-$SOURCEDIR}"
|
||||||
|
friendica="${2:-$FRIENDICA_VERSION}"
|
||||||
|
addons="${3:-$FRIENDICA_ADDONS}"
|
||||||
|
|
||||||
|
log 'Cloning Friendica '\'$friendica\'' with Addons '\'$addons\'' into '\'$dir\'
|
||||||
|
|
||||||
|
# Removing the whole directory first
|
||||||
|
rm -fr $dir/friendica
|
||||||
|
|
||||||
|
sh -c "git clone -b ${friendica} https://github.com/friendica/friendica ${dir}/friendica"
|
||||||
|
mkdir $dir/friendica/addon
|
||||||
|
sh -c "git clone -b ${addons} https://github.com/friendica/friendica-addons ${dir}/friendica/addon"
|
||||||
|
}
|
||||||
|
|
||||||
|
# help of this shell script
|
||||||
|
friendica_help() {
|
||||||
|
echo "Usage: friendica <command> [<args>]"
|
||||||
|
echo ""
|
||||||
|
echo "Commands:"
|
||||||
|
echo " console Executes an command in the Friendica console"
|
||||||
|
echo " composer Executes the composer.phar executable for Friendica"
|
||||||
|
echo " install Installs Friendica"
|
||||||
|
echo " update Updates Friendica"
|
||||||
|
exit 0
|
||||||
|
}
|
||||||
|
|
||||||
|
# executes the Friendica console
|
||||||
|
console() {
|
||||||
|
cd $WORKDIR
|
||||||
|
# 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 $@"
|
||||||
|
}
|
||||||
|
|
||||||
|
# executes the composer.phar binary of Friendica
|
||||||
|
composer() {
|
||||||
|
if [ -f $WORKDIR/bin/composer.phar ]; then
|
||||||
|
run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar $@ -d $WORKDIR"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
copy_sources() {
|
||||||
|
installed_version="0.0.0.0"
|
||||||
|
if [ -f ${WORKDIR}/VERSION ]; then
|
||||||
|
installed_version="$(cat ${WORKDIR}/VERSION)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||||
|
clone_develop
|
||||||
|
fi
|
||||||
|
|
||||||
|
image_version="0.0.0.0"
|
||||||
|
if [ -f $SOURCEDIR/friendica/VERSION ]; then
|
||||||
|
image_version="$(cat $SOURCEDIR/friendica/VERSION)"
|
||||||
|
else
|
||||||
|
# no given installation and not using the developer branch => nothing to do
|
||||||
|
log 'Friendica command '\'$1\'' failed, because of no version found', 0
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if version_greater "$installed_version" "$image_version"; then
|
||||||
|
log 'Can'\''t copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ('$image_version')', 0
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if version_greater "$image_version" "$installed_version"; then
|
||||||
|
if [ "$(id -u)" = 0 ]; then
|
||||||
|
rsync_options="-rlDog --chown=www-data:root"
|
||||||
|
else
|
||||||
|
rsync_options="-rlD"
|
||||||
|
fi
|
||||||
|
|
||||||
|
log 'Copying Friendica sources ('$image_version') from '\'$SOURCEDIR'/friendica'\'' to '\'$WORKDIR\'
|
||||||
|
rsync $rsync_options --delete --exclude='.git' $SOURCEDIR/friendica/ $WORKDIR/
|
||||||
|
|
||||||
|
if [ -f $WORKDIR/view/smarty3 ]; then
|
||||||
|
chmod 777 $WORKDIR/view/smarty3
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# install Friendica
|
||||||
|
install() {
|
||||||
|
if [ -f ${WORKDIR}/VERSION ]; then
|
||||||
|
# If there is a given installation of Friendica and we should not update it => exit
|
||||||
|
# We have to explicit update Friendica to avoid breaking something
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
copy_sources
|
||||||
|
|
||||||
|
log 'Installing Friendica'
|
||||||
|
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||||
|
composer "install"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -f ${WORKDIR}/.htconfig.php ] &&
|
||||||
|
[ -f ${SOURCEDIR}/config/htconfig.php ] &&
|
||||||
|
"$AUTOINSTALL" == "true"; then
|
||||||
|
run_as "cp ${SOURCEDIR}/config/htconfig.php ${WORKDIR}/html/.htconfig.php"
|
||||||
|
# TODO Pull Request for dba Change
|
||||||
|
run_as "sed -i 's/\s+\sDNS_CNAME//g' ${WORKDIR}/include/dba.php"
|
||||||
|
console "autoinstall -f .htconfig.php"
|
||||||
|
# TODO Workaround because of a strange permission issue
|
||||||
|
rm -fr ${WORKDIR}/view/smarty3/compiled
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
update() {
|
||||||
|
if [ ! -f ${WORKDIR}/VERSION ]; then
|
||||||
|
# We want to update a given installation
|
||||||
|
# if there is no installation, exit
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
copy_sources
|
||||||
|
|
||||||
|
log 'Upgrading Friendica'
|
||||||
|
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||||
|
composer "install"
|
||||||
|
fi
|
||||||
|
console "dbstructure update"
|
||||||
|
}
|
||||||
|
|
||||||
|
sendmail() {
|
||||||
|
if [ ! -f /etc/init.d/sendmail ]; then
|
||||||
|
# If sendmail isn't installed, exit this method
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
line=$(head -n 1 /etc/hosts)
|
||||||
|
line2=$(echo $line | awk '{print $2}')
|
||||||
|
echo "$line $line2.localdomain" >> /etc/hosts
|
||||||
|
|
||||||
|
log 'Starting sendmail for Mail-Support'
|
||||||
|
nohup /etc/init.d/sendmail start > /dev/null 2>&1 &
|
||||||
|
}
|
||||||
|
|
||||||
|
if [ $# -eq 0 ]; then
|
||||||
|
friendica_help
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
install) shift; install "$@";;
|
||||||
|
update) shift; update "$@" ;;
|
||||||
|
console) shift; console "$@" ;;
|
||||||
|
composer) shift; composer "$@" ;;
|
||||||
|
sendmail) shift; sendmail "$@" ;;
|
||||||
|
*) friendica_help ;;
|
||||||
|
esac
|
||||||
|
|
@ -1,4 +1,14 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
exec busybox crond -f -l 0 -L /dev/stdout
|
trap "break;exit" SIGHUP SIGINT SIGTERM
|
||||||
|
|
||||||
|
while [ ! -f /var/www/html/.htconfig.php ]; do
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
|
||||||
|
while true; do
|
||||||
|
cd /var/www/html
|
||||||
|
php -f /var/www/html/bin/worker.php
|
||||||
|
sleep 10m
|
||||||
|
done
|
||||||
|
|
@ -1,109 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
FRIENDICA_VERSION=${FRIENDICA_VERSION:-develop}
|
friendica install -q
|
||||||
FRIENDICA_ADDONS=${FRIENDICA_ADDONS:-develop}
|
friendica sendmail -q
|
||||||
AUTOINSTALL=${AUTOINSTALL:-false}
|
|
||||||
|
|
||||||
SOURCEDIR=/usr/src
|
|
||||||
WORKDIR=/var/www/html
|
|
||||||
|
|
||||||
# run an command with the www-data user
|
|
||||||
run_as() {
|
|
||||||
if [ "$(id -u)" = 0 ]; then
|
|
||||||
su - www-data -s /bin/sh -c "$1"
|
|
||||||
else
|
|
||||||
sh -c "$1"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# checks if the the first parameter is greater than the second parameter
|
|
||||||
version_greater() {
|
|
||||||
[ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 | head -n 1)" != "$1" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
# executes the Friendica console
|
|
||||||
console() {
|
|
||||||
cd $WORKDIR
|
|
||||||
# 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 $@"
|
|
||||||
}
|
|
||||||
|
|
||||||
# If there is no VERSION file or the command is "update", (re-)install Friendica
|
|
||||||
if [ ! -f $WORKDIR/VERSION -o "$1" = "update" ]; then
|
|
||||||
|
|
||||||
installed_version="0.0.0.0"
|
|
||||||
if [ -f $WORKDIR/VERSION ]; then
|
|
||||||
installed_version="$(cat $WORKDIR/VERSION)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
|
||||||
# Removing the whole directory first
|
|
||||||
rm -fr $SOURCEDIR/friendica
|
|
||||||
|
|
||||||
sh -c "git clone -q -b $FRIENDICA_VERSION https://github.com/friendica/friendica $SOURCEDIR/friendica"
|
|
||||||
if [ -f $SOURCEDIR/friendica/view/smarty3 ]; then
|
|
||||||
chmod 777 $SOURCEDIR/friendica/view/smarty3
|
|
||||||
fi
|
|
||||||
mkdir $SOURCEDIR/friendica/addon
|
|
||||||
sh -c "git clone -q -b $FRIENDICA_ADDONS https://github.com/friendica/friendica-addons $SOURCEDIR/friendica/addon"
|
|
||||||
fi
|
|
||||||
|
|
||||||
image_version="0.0.0.0"
|
|
||||||
if [ -f $SOURCEDIR/friendica/VERSION ]; then
|
|
||||||
image_version="$(cat $SOURCEDIR/friendica/VERSION)"
|
|
||||||
else
|
|
||||||
# no given installation and not using the developer branch => nothing to do
|
|
||||||
echo "Friendica command '$1' failed, because no version found"
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
|
||||||
echo "Can't copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ($image_version)"
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if version_greater "$image_version" "$installed_version"; then
|
|
||||||
if [ "$(id -u)" = 0 ]; then
|
|
||||||
rsync_options="-rlDog --chown www-data:root"
|
|
||||||
else
|
|
||||||
rsync_options="-rlD"
|
|
||||||
fi
|
|
||||||
|
|
||||||
rsync $rsync_options --delete --exclude='.git/' ${SOURCEDIR}/friendica/ ${WORKDIR}/
|
|
||||||
|
|
||||||
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
|
||||||
if [ ! -f ${WORKDIR}/bin/composer.phar ]; then
|
|
||||||
echo "no composer found"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
run_as "cd $WORKDIR;$WORKDIR/bin/composer.phar install -d $WORKDIR"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f $WORKDIR/.htconfig.php ] &&
|
|
||||||
[ -f $SOURCEDIR/config/htconfig.php ] &&
|
|
||||||
"$AUTOINSTALL" == "true"; then
|
|
||||||
run_as "cp $SOURCEDIR/config/htconfig.php $WORKDIR/html/.htconfig.php"
|
|
||||||
# TODO Pull Request for dba Change
|
|
||||||
run_as "sed -i 's/\s+\sDNS_CNAME//g' $WORKDIR/include/dba.php"
|
|
||||||
console "autoinstall -f .htconfig.php"
|
|
||||||
# TODO Workaround because of a strange permission issue
|
|
||||||
rm -fr $WORKDIR/view/smarty3/compiled
|
|
||||||
elif [ "$1" = "update" ]; then
|
|
||||||
console "dbstructure update"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Start sendmail if you find it
|
|
||||||
if [ -f /etc/init.d/sendmail ]; then
|
|
||||||
|
|
||||||
line=$(head -n 1 /etc/hosts)
|
|
||||||
line2=$(echo $line | awk '{print $2}')
|
|
||||||
echo "$line $line2.localdomain" >> /etc/hosts
|
|
||||||
|
|
||||||
nohup /etc/init.d/sendmail start > /dev/null 2>&1 &
|
|
||||||
fi
|
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
Loading…
Reference in a new issue