mirror of https://github.com/friendica/docker
Fixing a lot of spaces & tabs!
This commit is contained in:
parent
aa0795900a
commit
7fe1de658d
|
@ -6,5 +6,23 @@ root = true
|
||||||
[*]
|
[*]
|
||||||
charset = utf-8
|
charset = utf-8
|
||||||
end_of_line = lf
|
end_of_line = lf
|
||||||
trim_trailing_whitespaces = true
|
insert_final_newline = true
|
||||||
indent_style = tab
|
|
||||||
|
[*.md]
|
||||||
|
indent_style = tab
|
||||||
|
|
||||||
|
[*.sh]
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 2
|
||||||
|
|
||||||
|
[*.yml]
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 2
|
||||||
|
|
||||||
|
[*.template]
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 4
|
||||||
|
|
||||||
|
[Dockerfile]
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 4
|
||||||
|
|
|
@ -56,8 +56,8 @@ RUN set -ex; \
|
||||||
--with-jpeg-dir=/usr/include/ \
|
--with-jpeg-dir=/usr/include/ \
|
||||||
; \
|
; \
|
||||||
docker-php-ext-configure ldap \
|
docker-php-ext-configure ldap \
|
||||||
--with-libdir=lib/$debMultiarch/ \
|
--with-libdir=lib/$debMultiarch/ \
|
||||||
; \
|
;\
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
pdo_mysql \
|
pdo_mysql \
|
||||||
gd \
|
gd \
|
||||||
|
@ -85,12 +85,12 @@ RUN set -ex; \
|
||||||
apt-mark auto '.*' > /dev/null; \
|
apt-mark auto '.*' > /dev/null; \
|
||||||
apt-mark manual $savedAptMark; \
|
apt-mark manual $savedAptMark; \
|
||||||
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
|
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
|
||||||
| awk '/=>/ { print $3 }' \
|
| awk '/=>/ { print $3 }' \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs -r dpkg-query -S \
|
| xargs -r dpkg-query -S \
|
||||||
| cut -d: -f1 \
|
| cut -d: -f1 \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs -rt apt-mark manual; \
|
| xargs -rt apt-mark manual; \
|
||||||
\
|
\
|
||||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
trap "break;exit" HUP INT TERM
|
trap "break;exit" HUP INT TERM
|
||||||
|
|
||||||
while [ ! -f /var/www/html/bin/daemon.php ]; do
|
while [ ! -f /var/www/html/bin/daemon.php ]; do
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
||||||
|
|
|
@ -3,147 +3,147 @@ set -eu
|
||||||
|
|
||||||
# run an command with the www-data user
|
# run an command with the www-data user
|
||||||
run_as() {
|
run_as() {
|
||||||
set -- -c "cd /var/www/html; $*"
|
set -- -c "cd /var/www/html; $*"
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
su - www-data -s /bin/sh "$@"
|
su - www-data -s /bin/sh "$@"
|
||||||
else
|
else
|
||||||
sh "$@"
|
sh "$@"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# checks if the the first parameter is greater than the second parameter
|
# checks if the the first parameter is greater than the second parameter
|
||||||
version_greater() {
|
version_greater() {
|
||||||
[ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
|
[ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
setup_ssmtp() {
|
setup_ssmtp() {
|
||||||
if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
|
if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
|
||||||
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
|
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
|
||||||
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
|
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
|
||||||
|
|
||||||
smtp_from=${SMTP_FROM:-no-reply}
|
smtp_from=${SMTP_FROM:-no-reply}
|
||||||
|
|
||||||
# Setup SSMTP
|
# Setup SSMTP
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
|
||||||
|
|
||||||
# add possible mail-senders
|
# add possible mail-senders
|
||||||
{
|
{
|
||||||
echo "www-data:$smtp_from@$SMTP_DOMAIN:$SMTP"
|
echo "www-data:$smtp_from@$SMTP_DOMAIN:$SMTP"
|
||||||
echo "root::$smtp_from@$SMTP_DOMAIN:$SMTP"
|
echo "root::$smtp_from@$SMTP_DOMAIN:$SMTP"
|
||||||
} > /etc/ssmtp/revaliases
|
} > /etc/ssmtp/revaliases
|
||||||
|
|
||||||
# replace ssmtp.conf settings
|
# replace ssmtp.conf settings
|
||||||
{
|
{
|
||||||
echo "root=:$smtp_from@$SMTP_DOMAIN"
|
echo "root=:$smtp_from@$SMTP_DOMAIN"
|
||||||
echo "hostname=$SMTP_DOMAIN"
|
echo "hostname=$SMTP_DOMAIN"
|
||||||
echo "mailhub=$SMTP"
|
echo "mailhub=$SMTP"
|
||||||
echo "FromLineOverride=YES"
|
echo "FromLineOverride=YES"
|
||||||
if [ -n "${SMTP_TLS+x}" ]; then echo "UseTLS=$SMTP_TLS"; fi
|
if [ -n "${SMTP_TLS+x}" ]; then echo "UseTLS=$SMTP_TLS"; fi
|
||||||
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "UseSTARTTLS=$SMTP_STARTTLS"; fi
|
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "UseSTARTTLS=$SMTP_STARTTLS"; fi
|
||||||
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "AuthUser=$SMTP_AUTH_USER"; fi
|
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "AuthUser=$SMTP_AUTH_USER"; fi
|
||||||
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "AuthPass=$SMTP_AUTH_PASS";fi
|
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "AuthPass=$SMTP_AUTH_PASS";fi
|
||||||
if [ -n "${SMTP_AUTH_METHOD+x}" ]; then echo "AuthMethod=$SMTP_AUTH_METHOD"; fi
|
if [ -n "${SMTP_AUTH_METHOD+x}" ]; then echo "AuthMethod=$SMTP_AUTH_METHOD"; fi
|
||||||
} > /etc/ssmtp/ssmtp.conf
|
} > /etc/ssmtp/ssmtp.conf
|
||||||
|
|
||||||
echo "Setup finished"
|
echo "Setup finished"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# just check if we execute apache or php-fpm
|
# just check if we execute apache or php-fpm
|
||||||
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
||||||
installed_version="0.0.0.0"
|
installed_version="0.0.0.0"
|
||||||
if [ -f /var/www/html/VERSION ]; then
|
if [ -f /var/www/html/VERSION ]; then
|
||||||
installed_version="$(cat /var/www/html/VERSION)"
|
installed_version="$(cat /var/www/html/VERSION)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
image_version="$(cat /usr/src/friendica/VERSION)"
|
image_version="$(cat /usr/src/friendica/VERSION)"
|
||||||
|
|
||||||
# no downgrading possible
|
# no downgrading possible
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
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)"
|
echo "Can't copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ($image_version)"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
setup_ssmtp
|
setup_ssmtp
|
||||||
|
|
||||||
# check it just in case the version is greater or if we force the upgrade
|
# check it just in case the version is greater or if we force the upgrade
|
||||||
if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
|
if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
|
||||||
echo "Initializing Friendica $image_version ..."
|
echo "Initializing Friendica $image_version ..."
|
||||||
|
|
||||||
if [ "$installed_version" != "0.0.0.0" ]; then
|
if [ "$installed_version" != "0.0.0.0" ]; then
|
||||||
echo "Upgrading Friendica from $installed_version ..."
|
echo "Upgrading Friendica from $installed_version ..."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
rsync_options="-rlDog --chown=www-data:www-data"
|
rsync_options="-rlDog --chown=www-data:www-data"
|
||||||
else
|
else
|
||||||
rsync_options="-rlD"
|
rsync_options="-rlD"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
|
rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
|
||||||
|
|
||||||
# Update docker-based config files, but never delete other config files
|
# Update docker-based config files, but never delete other config files
|
||||||
rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
|
rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
|
||||||
|
|
||||||
# In case there is no .htaccess, copy it from the default dist file
|
# In case there is no .htaccess, copy it from the default dist file
|
||||||
if [ ! -f "/var/www/html/.htaccess" ]; then
|
if [ ! -f "/var/www/html/.htaccess" ]; then
|
||||||
cp "/var/www/html/.htaccess-dist" "/var/www/html/.htaccess"
|
cp "/var/www/html/.htaccess-dist" "/var/www/html/.htaccess"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d /var/www/html/view/smarty3 ]; then
|
if [ -d /var/www/html/view/smarty3 ]; then
|
||||||
chmod -R 777 /var/www/html/view/smarty3
|
chmod -R 777 /var/www/html/view/smarty3
|
||||||
fi
|
fi
|
||||||
echo "Initializing finished"
|
echo "Initializing finished"
|
||||||
|
|
||||||
# install
|
# install
|
||||||
if [ "$installed_version" = "0.0.0.0" ]; then
|
if [ "$installed_version" = "0.0.0.0" ]; then
|
||||||
echo "New Friendica instance"
|
echo "New Friendica instance"
|
||||||
|
|
||||||
install=false
|
install=false
|
||||||
if [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${FRIENDICA_ADMIN_MAIL+x}" ] && [ -n "${FRIENDICA_URL+x}" ]; then
|
if [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${FRIENDICA_ADMIN_MAIL+x}" ] && [ -n "${FRIENDICA_URL+x}" ]; then
|
||||||
echo "Installation with environment variables"
|
echo "Installation with environment variables"
|
||||||
|
|
||||||
FRIENDICA_TZ=${FRIENDICA_TZ:-America/LosAngeles}
|
FRIENDICA_TZ=${FRIENDICA_TZ:-America/LosAngeles}
|
||||||
FRIENDICA_LANG=${FRIENDICA_LANG:-en}
|
FRIENDICA_LANG=${FRIENDICA_LANG:-en}
|
||||||
MYSQL_PORT=${MYSQL_PORT:-3306}
|
MYSQL_PORT=${MYSQL_PORT:-3306}
|
||||||
|
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
install_options='-s --dbhost "'$MYSQL_HOST'" --dbport "'$MYSQL_PORT'" --dbdata "'$MYSQL_DATABASE'" --dbuser "'$MYSQL_USER'" --dbpass "'$MYSQL_PASSWORD'"'
|
install_options='-s --dbhost "'$MYSQL_HOST'" --dbport "'$MYSQL_PORT'" --dbdata "'$MYSQL_DATABASE'" --dbuser "'$MYSQL_USER'" --dbpass "'$MYSQL_PASSWORD'"'
|
||||||
|
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'" --url "'$FRIENDICA_URL'"'
|
install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'" --url "'$FRIENDICA_URL'"'
|
||||||
install=true
|
install=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$install" = true ]; then
|
if [ "$install" = true ]; then
|
||||||
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
||||||
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
|
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
|
||||||
|
|
||||||
echo "Starting Friendica installation ..."
|
echo "Starting Friendica installation ..."
|
||||||
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
|
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
|
||||||
|
|
||||||
rm -fr /var/www/html/view/smarty3/compiled
|
rm -fr /var/www/html/view/smarty3/compiled
|
||||||
|
|
||||||
# load other config files (*.config.php) to the config folder
|
# load other config files (*.config.php) to the config folder
|
||||||
if [ -d "/usr/src/config" ]; then
|
if [ -d "/usr/src/config" ]; then
|
||||||
rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
|
rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Installation finished"
|
echo "Installation finished"
|
||||||
else
|
else
|
||||||
echo "[ERROR] Waited 300 seconds, no response" >&2
|
echo "[ERROR] Waited 300 seconds, no response" >&2
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "Running web-based installer on first connect!"
|
echo "Running web-based installer on first connect!"
|
||||||
fi
|
fi
|
||||||
# upgrade
|
# upgrade
|
||||||
else
|
else
|
||||||
echo "Upgrading Friendica ..."
|
echo "Upgrading Friendica ..."
|
||||||
run_as 'php /var/www/html/bin/console.php dbstructure update'
|
run_as 'php /var/www/html/bin/console.php dbstructure update'
|
||||||
echo "Upgrading finished"
|
echo "Upgrading finished"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
|
@ -42,12 +42,12 @@ RUN set -ex; \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
pdo_mysql \
|
pdo_mysql \
|
||||||
gd \
|
gd \
|
||||||
zip \
|
zip \
|
||||||
opcache \
|
opcache \
|
||||||
pcntl \
|
pcntl \
|
||||||
ldap \
|
ldap \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
# pecl will claim success even if one install fails, so we need to perform each install separately
|
# pecl will claim success even if one install fails, so we need to perform each install separately
|
||||||
|
@ -57,17 +57,17 @@ RUN set -ex; \
|
||||||
pecl install imagick-3.4.4; \
|
pecl install imagick-3.4.4; \
|
||||||
\
|
\
|
||||||
docker-php-ext-enable \
|
docker-php-ext-enable \
|
||||||
apcu \
|
apcu \
|
||||||
memcached \
|
memcached \
|
||||||
redis \
|
redis \
|
||||||
imagick \
|
imagick \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
runDeps="$( \
|
runDeps="$( \
|
||||||
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
|
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
|
||||||
| tr ',' '\n' \
|
| tr ',' '\n' \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| awk 'system("[ -e /usr/local/lib" $1 " ]") == 0 { next } { print "so:" $1 }' \
|
| awk 'system("[ -e /usr/local/lib" $1 " ]") == 0 { next } { print "so:" $1 }' \
|
||||||
)"; \
|
)"; \
|
||||||
apk add --no-network --virtual .friendica-phpext-rundeps $runDeps; \
|
apk add --no-network --virtual .friendica-phpext-rundeps $runDeps; \
|
||||||
apk del --no-network .build-deps;
|
apk del --no-network .build-deps;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
trap "break;exit" HUP INT TERM
|
trap "break;exit" HUP INT TERM
|
||||||
|
|
||||||
while [ ! -f /var/www/html/bin/daemon.php ]; do
|
while [ ! -f /var/www/html/bin/daemon.php ]; do
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
||||||
|
|
|
@ -3,147 +3,147 @@ set -eu
|
||||||
|
|
||||||
# run an command with the www-data user
|
# run an command with the www-data user
|
||||||
run_as() {
|
run_as() {
|
||||||
set -- -c "cd /var/www/html; $*"
|
set -- -c "cd /var/www/html; $*"
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
su - www-data -s /bin/sh "$@"
|
su - www-data -s /bin/sh "$@"
|
||||||
else
|
else
|
||||||
sh "$@"
|
sh "$@"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# checks if the the first parameter is greater than the second parameter
|
# checks if the the first parameter is greater than the second parameter
|
||||||
version_greater() {
|
version_greater() {
|
||||||
[ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
|
[ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
setup_ssmtp() {
|
setup_ssmtp() {
|
||||||
if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
|
if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
|
||||||
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
|
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
|
||||||
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
|
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
|
||||||
|
|
||||||
smtp_from=${SMTP_FROM:-no-reply}
|
smtp_from=${SMTP_FROM:-no-reply}
|
||||||
|
|
||||||
# Setup SSMTP
|
# Setup SSMTP
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
|
||||||
|
|
||||||
# add possible mail-senders
|
# add possible mail-senders
|
||||||
{
|
{
|
||||||
echo "www-data:$smtp_from@$SMTP_DOMAIN:$SMTP"
|
echo "www-data:$smtp_from@$SMTP_DOMAIN:$SMTP"
|
||||||
echo "root::$smtp_from@$SMTP_DOMAIN:$SMTP"
|
echo "root::$smtp_from@$SMTP_DOMAIN:$SMTP"
|
||||||
} > /etc/ssmtp/revaliases
|
} > /etc/ssmtp/revaliases
|
||||||
|
|
||||||
# replace ssmtp.conf settings
|
# replace ssmtp.conf settings
|
||||||
{
|
{
|
||||||
echo "root=:$smtp_from@$SMTP_DOMAIN"
|
echo "root=:$smtp_from@$SMTP_DOMAIN"
|
||||||
echo "hostname=$SMTP_DOMAIN"
|
echo "hostname=$SMTP_DOMAIN"
|
||||||
echo "mailhub=$SMTP"
|
echo "mailhub=$SMTP"
|
||||||
echo "FromLineOverride=YES"
|
echo "FromLineOverride=YES"
|
||||||
if [ -n "${SMTP_TLS+x}" ]; then echo "UseTLS=$SMTP_TLS"; fi
|
if [ -n "${SMTP_TLS+x}" ]; then echo "UseTLS=$SMTP_TLS"; fi
|
||||||
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "UseSTARTTLS=$SMTP_STARTTLS"; fi
|
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "UseSTARTTLS=$SMTP_STARTTLS"; fi
|
||||||
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "AuthUser=$SMTP_AUTH_USER"; fi
|
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "AuthUser=$SMTP_AUTH_USER"; fi
|
||||||
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "AuthPass=$SMTP_AUTH_PASS";fi
|
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "AuthPass=$SMTP_AUTH_PASS";fi
|
||||||
if [ -n "${SMTP_AUTH_METHOD+x}" ]; then echo "AuthMethod=$SMTP_AUTH_METHOD"; fi
|
if [ -n "${SMTP_AUTH_METHOD+x}" ]; then echo "AuthMethod=$SMTP_AUTH_METHOD"; fi
|
||||||
} > /etc/ssmtp/ssmtp.conf
|
} > /etc/ssmtp/ssmtp.conf
|
||||||
|
|
||||||
echo "Setup finished"
|
echo "Setup finished"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# just check if we execute apache or php-fpm
|
# just check if we execute apache or php-fpm
|
||||||
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
||||||
installed_version="0.0.0.0"
|
installed_version="0.0.0.0"
|
||||||
if [ -f /var/www/html/VERSION ]; then
|
if [ -f /var/www/html/VERSION ]; then
|
||||||
installed_version="$(cat /var/www/html/VERSION)"
|
installed_version="$(cat /var/www/html/VERSION)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
image_version="$(cat /usr/src/friendica/VERSION)"
|
image_version="$(cat /usr/src/friendica/VERSION)"
|
||||||
|
|
||||||
# no downgrading possible
|
# no downgrading possible
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
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)"
|
echo "Can't copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ($image_version)"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
setup_ssmtp
|
setup_ssmtp
|
||||||
|
|
||||||
# check it just in case the version is greater or if we force the upgrade
|
# check it just in case the version is greater or if we force the upgrade
|
||||||
if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
|
if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
|
||||||
echo "Initializing Friendica $image_version ..."
|
echo "Initializing Friendica $image_version ..."
|
||||||
|
|
||||||
if [ "$installed_version" != "0.0.0.0" ]; then
|
if [ "$installed_version" != "0.0.0.0" ]; then
|
||||||
echo "Upgrading Friendica from $installed_version ..."
|
echo "Upgrading Friendica from $installed_version ..."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
rsync_options="-rlDog --chown=www-data:www-data"
|
rsync_options="-rlDog --chown=www-data:www-data"
|
||||||
else
|
else
|
||||||
rsync_options="-rlD"
|
rsync_options="-rlD"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
|
rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
|
||||||
|
|
||||||
# Update docker-based config files, but never delete other config files
|
# Update docker-based config files, but never delete other config files
|
||||||
rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
|
rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
|
||||||
|
|
||||||
# In case there is no .htaccess, copy it from the default dist file
|
# In case there is no .htaccess, copy it from the default dist file
|
||||||
if [ ! -f "/var/www/html/.htaccess" ]; then
|
if [ ! -f "/var/www/html/.htaccess" ]; then
|
||||||
cp "/var/www/html/.htaccess-dist" "/var/www/html/.htaccess"
|
cp "/var/www/html/.htaccess-dist" "/var/www/html/.htaccess"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d /var/www/html/view/smarty3 ]; then
|
if [ -d /var/www/html/view/smarty3 ]; then
|
||||||
chmod -R 777 /var/www/html/view/smarty3
|
chmod -R 777 /var/www/html/view/smarty3
|
||||||
fi
|
fi
|
||||||
echo "Initializing finished"
|
echo "Initializing finished"
|
||||||
|
|
||||||
# install
|
# install
|
||||||
if [ "$installed_version" = "0.0.0.0" ]; then
|
if [ "$installed_version" = "0.0.0.0" ]; then
|
||||||
echo "New Friendica instance"
|
echo "New Friendica instance"
|
||||||
|
|
||||||
install=false
|
install=false
|
||||||
if [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${FRIENDICA_ADMIN_MAIL+x}" ] && [ -n "${FRIENDICA_URL+x}" ]; then
|
if [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${FRIENDICA_ADMIN_MAIL+x}" ] && [ -n "${FRIENDICA_URL+x}" ]; then
|
||||||
echo "Installation with environment variables"
|
echo "Installation with environment variables"
|
||||||
|
|
||||||
FRIENDICA_TZ=${FRIENDICA_TZ:-America/LosAngeles}
|
FRIENDICA_TZ=${FRIENDICA_TZ:-America/LosAngeles}
|
||||||
FRIENDICA_LANG=${FRIENDICA_LANG:-en}
|
FRIENDICA_LANG=${FRIENDICA_LANG:-en}
|
||||||
MYSQL_PORT=${MYSQL_PORT:-3306}
|
MYSQL_PORT=${MYSQL_PORT:-3306}
|
||||||
|
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
install_options='-s --dbhost "'$MYSQL_HOST'" --dbport "'$MYSQL_PORT'" --dbdata "'$MYSQL_DATABASE'" --dbuser "'$MYSQL_USER'" --dbpass "'$MYSQL_PASSWORD'"'
|
install_options='-s --dbhost "'$MYSQL_HOST'" --dbport "'$MYSQL_PORT'" --dbdata "'$MYSQL_DATABASE'" --dbuser "'$MYSQL_USER'" --dbpass "'$MYSQL_PASSWORD'"'
|
||||||
|
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'" --url "'$FRIENDICA_URL'"'
|
install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'" --url "'$FRIENDICA_URL'"'
|
||||||
install=true
|
install=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$install" = true ]; then
|
if [ "$install" = true ]; then
|
||||||
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
||||||
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
|
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
|
||||||
|
|
||||||
echo "Starting Friendica installation ..."
|
echo "Starting Friendica installation ..."
|
||||||
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
|
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
|
||||||
|
|
||||||
rm -fr /var/www/html/view/smarty3/compiled
|
rm -fr /var/www/html/view/smarty3/compiled
|
||||||
|
|
||||||
# load other config files (*.config.php) to the config folder
|
# load other config files (*.config.php) to the config folder
|
||||||
if [ -d "/usr/src/config" ]; then
|
if [ -d "/usr/src/config" ]; then
|
||||||
rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
|
rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Installation finished"
|
echo "Installation finished"
|
||||||
else
|
else
|
||||||
echo "[ERROR] Waited 300 seconds, no response" >&2
|
echo "[ERROR] Waited 300 seconds, no response" >&2
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "Running web-based installer on first connect!"
|
echo "Running web-based installer on first connect!"
|
||||||
fi
|
fi
|
||||||
# upgrade
|
# upgrade
|
||||||
else
|
else
|
||||||
echo "Upgrading Friendica ..."
|
echo "Upgrading Friendica ..."
|
||||||
run_as 'php /var/www/html/bin/console.php dbstructure update'
|
run_as 'php /var/www/html/bin/console.php dbstructure update'
|
||||||
echo "Upgrading finished"
|
echo "Upgrading finished"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
|
@ -56,8 +56,8 @@ RUN set -ex; \
|
||||||
--with-jpeg-dir=/usr/include/ \
|
--with-jpeg-dir=/usr/include/ \
|
||||||
; \
|
; \
|
||||||
docker-php-ext-configure ldap \
|
docker-php-ext-configure ldap \
|
||||||
--with-libdir=lib/$debMultiarch/ \
|
--with-libdir=lib/$debMultiarch/ \
|
||||||
; \
|
;\
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
pdo_mysql \
|
pdo_mysql \
|
||||||
gd \
|
gd \
|
||||||
|
@ -85,12 +85,12 @@ RUN set -ex; \
|
||||||
apt-mark auto '.*' > /dev/null; \
|
apt-mark auto '.*' > /dev/null; \
|
||||||
apt-mark manual $savedAptMark; \
|
apt-mark manual $savedAptMark; \
|
||||||
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
|
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
|
||||||
| awk '/=>/ { print $3 }' \
|
| awk '/=>/ { print $3 }' \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs -r dpkg-query -S \
|
| xargs -r dpkg-query -S \
|
||||||
| cut -d: -f1 \
|
| cut -d: -f1 \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs -rt apt-mark manual; \
|
| xargs -rt apt-mark manual; \
|
||||||
\
|
\
|
||||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
trap "break;exit" HUP INT TERM
|
trap "break;exit" HUP INT TERM
|
||||||
|
|
||||||
while [ ! -f /var/www/html/bin/daemon.php ]; do
|
while [ ! -f /var/www/html/bin/daemon.php ]; do
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
||||||
|
|
|
@ -3,147 +3,147 @@ set -eu
|
||||||
|
|
||||||
# run an command with the www-data user
|
# run an command with the www-data user
|
||||||
run_as() {
|
run_as() {
|
||||||
set -- -c "cd /var/www/html; $*"
|
set -- -c "cd /var/www/html; $*"
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
su - www-data -s /bin/sh "$@"
|
su - www-data -s /bin/sh "$@"
|
||||||
else
|
else
|
||||||
sh "$@"
|
sh "$@"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# checks if the the first parameter is greater than the second parameter
|
# checks if the the first parameter is greater than the second parameter
|
||||||
version_greater() {
|
version_greater() {
|
||||||
[ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
|
[ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
setup_ssmtp() {
|
setup_ssmtp() {
|
||||||
if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
|
if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
|
||||||
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
|
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
|
||||||
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
|
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
|
||||||
|
|
||||||
smtp_from=${SMTP_FROM:-no-reply}
|
smtp_from=${SMTP_FROM:-no-reply}
|
||||||
|
|
||||||
# Setup SSMTP
|
# Setup SSMTP
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
|
||||||
|
|
||||||
# add possible mail-senders
|
# add possible mail-senders
|
||||||
{
|
{
|
||||||
echo "www-data:$smtp_from@$SMTP_DOMAIN:$SMTP"
|
echo "www-data:$smtp_from@$SMTP_DOMAIN:$SMTP"
|
||||||
echo "root::$smtp_from@$SMTP_DOMAIN:$SMTP"
|
echo "root::$smtp_from@$SMTP_DOMAIN:$SMTP"
|
||||||
} > /etc/ssmtp/revaliases
|
} > /etc/ssmtp/revaliases
|
||||||
|
|
||||||
# replace ssmtp.conf settings
|
# replace ssmtp.conf settings
|
||||||
{
|
{
|
||||||
echo "root=:$smtp_from@$SMTP_DOMAIN"
|
echo "root=:$smtp_from@$SMTP_DOMAIN"
|
||||||
echo "hostname=$SMTP_DOMAIN"
|
echo "hostname=$SMTP_DOMAIN"
|
||||||
echo "mailhub=$SMTP"
|
echo "mailhub=$SMTP"
|
||||||
echo "FromLineOverride=YES"
|
echo "FromLineOverride=YES"
|
||||||
if [ -n "${SMTP_TLS+x}" ]; then echo "UseTLS=$SMTP_TLS"; fi
|
if [ -n "${SMTP_TLS+x}" ]; then echo "UseTLS=$SMTP_TLS"; fi
|
||||||
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "UseSTARTTLS=$SMTP_STARTTLS"; fi
|
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "UseSTARTTLS=$SMTP_STARTTLS"; fi
|
||||||
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "AuthUser=$SMTP_AUTH_USER"; fi
|
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "AuthUser=$SMTP_AUTH_USER"; fi
|
||||||
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "AuthPass=$SMTP_AUTH_PASS";fi
|
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "AuthPass=$SMTP_AUTH_PASS";fi
|
||||||
if [ -n "${SMTP_AUTH_METHOD+x}" ]; then echo "AuthMethod=$SMTP_AUTH_METHOD"; fi
|
if [ -n "${SMTP_AUTH_METHOD+x}" ]; then echo "AuthMethod=$SMTP_AUTH_METHOD"; fi
|
||||||
} > /etc/ssmtp/ssmtp.conf
|
} > /etc/ssmtp/ssmtp.conf
|
||||||
|
|
||||||
echo "Setup finished"
|
echo "Setup finished"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# just check if we execute apache or php-fpm
|
# just check if we execute apache or php-fpm
|
||||||
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
||||||
installed_version="0.0.0.0"
|
installed_version="0.0.0.0"
|
||||||
if [ -f /var/www/html/VERSION ]; then
|
if [ -f /var/www/html/VERSION ]; then
|
||||||
installed_version="$(cat /var/www/html/VERSION)"
|
installed_version="$(cat /var/www/html/VERSION)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
image_version="$(cat /usr/src/friendica/VERSION)"
|
image_version="$(cat /usr/src/friendica/VERSION)"
|
||||||
|
|
||||||
# no downgrading possible
|
# no downgrading possible
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
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)"
|
echo "Can't copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ($image_version)"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
setup_ssmtp
|
setup_ssmtp
|
||||||
|
|
||||||
# check it just in case the version is greater or if we force the upgrade
|
# check it just in case the version is greater or if we force the upgrade
|
||||||
if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
|
if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
|
||||||
echo "Initializing Friendica $image_version ..."
|
echo "Initializing Friendica $image_version ..."
|
||||||
|
|
||||||
if [ "$installed_version" != "0.0.0.0" ]; then
|
if [ "$installed_version" != "0.0.0.0" ]; then
|
||||||
echo "Upgrading Friendica from $installed_version ..."
|
echo "Upgrading Friendica from $installed_version ..."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
rsync_options="-rlDog --chown=www-data:www-data"
|
rsync_options="-rlDog --chown=www-data:www-data"
|
||||||
else
|
else
|
||||||
rsync_options="-rlD"
|
rsync_options="-rlD"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
|
rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
|
||||||
|
|
||||||
# Update docker-based config files, but never delete other config files
|
# Update docker-based config files, but never delete other config files
|
||||||
rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
|
rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
|
||||||
|
|
||||||
# In case there is no .htaccess, copy it from the default dist file
|
# In case there is no .htaccess, copy it from the default dist file
|
||||||
if [ ! -f "/var/www/html/.htaccess" ]; then
|
if [ ! -f "/var/www/html/.htaccess" ]; then
|
||||||
cp "/var/www/html/.htaccess-dist" "/var/www/html/.htaccess"
|
cp "/var/www/html/.htaccess-dist" "/var/www/html/.htaccess"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d /var/www/html/view/smarty3 ]; then
|
if [ -d /var/www/html/view/smarty3 ]; then
|
||||||
chmod -R 777 /var/www/html/view/smarty3
|
chmod -R 777 /var/www/html/view/smarty3
|
||||||
fi
|
fi
|
||||||
echo "Initializing finished"
|
echo "Initializing finished"
|
||||||
|
|
||||||
# install
|
# install
|
||||||
if [ "$installed_version" = "0.0.0.0" ]; then
|
if [ "$installed_version" = "0.0.0.0" ]; then
|
||||||
echo "New Friendica instance"
|
echo "New Friendica instance"
|
||||||
|
|
||||||
install=false
|
install=false
|
||||||
if [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${FRIENDICA_ADMIN_MAIL+x}" ] && [ -n "${FRIENDICA_URL+x}" ]; then
|
if [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${FRIENDICA_ADMIN_MAIL+x}" ] && [ -n "${FRIENDICA_URL+x}" ]; then
|
||||||
echo "Installation with environment variables"
|
echo "Installation with environment variables"
|
||||||
|
|
||||||
FRIENDICA_TZ=${FRIENDICA_TZ:-America/LosAngeles}
|
FRIENDICA_TZ=${FRIENDICA_TZ:-America/LosAngeles}
|
||||||
FRIENDICA_LANG=${FRIENDICA_LANG:-en}
|
FRIENDICA_LANG=${FRIENDICA_LANG:-en}
|
||||||
MYSQL_PORT=${MYSQL_PORT:-3306}
|
MYSQL_PORT=${MYSQL_PORT:-3306}
|
||||||
|
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
install_options='-s --dbhost "'$MYSQL_HOST'" --dbport "'$MYSQL_PORT'" --dbdata "'$MYSQL_DATABASE'" --dbuser "'$MYSQL_USER'" --dbpass "'$MYSQL_PASSWORD'"'
|
install_options='-s --dbhost "'$MYSQL_HOST'" --dbport "'$MYSQL_PORT'" --dbdata "'$MYSQL_DATABASE'" --dbuser "'$MYSQL_USER'" --dbpass "'$MYSQL_PASSWORD'"'
|
||||||
|
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'" --url "'$FRIENDICA_URL'"'
|
install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'" --url "'$FRIENDICA_URL'"'
|
||||||
install=true
|
install=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$install" = true ]; then
|
if [ "$install" = true ]; then
|
||||||
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
||||||
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
|
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
|
||||||
|
|
||||||
echo "Starting Friendica installation ..."
|
echo "Starting Friendica installation ..."
|
||||||
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
|
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
|
||||||
|
|
||||||
rm -fr /var/www/html/view/smarty3/compiled
|
rm -fr /var/www/html/view/smarty3/compiled
|
||||||
|
|
||||||
# load other config files (*.config.php) to the config folder
|
# load other config files (*.config.php) to the config folder
|
||||||
if [ -d "/usr/src/config" ]; then
|
if [ -d "/usr/src/config" ]; then
|
||||||
rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
|
rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Installation finished"
|
echo "Installation finished"
|
||||||
else
|
else
|
||||||
echo "[ERROR] Waited 300 seconds, no response" >&2
|
echo "[ERROR] Waited 300 seconds, no response" >&2
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "Running web-based installer on first connect!"
|
echo "Running web-based installer on first connect!"
|
||||||
fi
|
fi
|
||||||
# upgrade
|
# upgrade
|
||||||
else
|
else
|
||||||
echo "Upgrading Friendica ..."
|
echo "Upgrading Friendica ..."
|
||||||
run_as 'php /var/www/html/bin/console.php dbstructure update'
|
run_as 'php /var/www/html/bin/console.php dbstructure update'
|
||||||
echo "Upgrading finished"
|
echo "Upgrading finished"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
|
@ -56,8 +56,8 @@ RUN set -ex; \
|
||||||
--with-jpeg-dir=/usr/include/ \
|
--with-jpeg-dir=/usr/include/ \
|
||||||
; \
|
; \
|
||||||
docker-php-ext-configure ldap \
|
docker-php-ext-configure ldap \
|
||||||
--with-libdir=lib/$debMultiarch/ \
|
--with-libdir=lib/$debMultiarch/ \
|
||||||
; \
|
;\
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
pdo_mysql \
|
pdo_mysql \
|
||||||
gd \
|
gd \
|
||||||
|
@ -85,12 +85,12 @@ RUN set -ex; \
|
||||||
apt-mark auto '.*' > /dev/null; \
|
apt-mark auto '.*' > /dev/null; \
|
||||||
apt-mark manual $savedAptMark; \
|
apt-mark manual $savedAptMark; \
|
||||||
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
|
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
|
||||||
| awk '/=>/ { print $3 }' \
|
| awk '/=>/ { print $3 }' \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs -r dpkg-query -S \
|
| xargs -r dpkg-query -S \
|
||||||
| cut -d: -f1 \
|
| cut -d: -f1 \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs -rt apt-mark manual; \
|
| xargs -rt apt-mark manual; \
|
||||||
\
|
\
|
||||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
trap "break;exit" HUP INT TERM
|
trap "break;exit" HUP INT TERM
|
||||||
|
|
||||||
while [ ! -f /var/www/html/bin/daemon.php ]; do
|
while [ ! -f /var/www/html/bin/daemon.php ]; do
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
||||||
|
|
|
@ -3,67 +3,67 @@ set -eu
|
||||||
|
|
||||||
# checks if the branch and repository exists
|
# checks if the branch and repository exists
|
||||||
check_branch() {
|
check_branch() {
|
||||||
repo=${1:-}
|
repo=${1:-}
|
||||||
branch=${2:-}
|
branch=${2:-}
|
||||||
git ls-remote --heads --tags "https://github.com/$repo" | grep -E "refs/(heads|tags)/${branch}$" >/dev/null
|
git ls-remote --heads --tags "https://github.com/$repo" | grep -E "refs/(heads|tags)/${branch}$" >/dev/null
|
||||||
[ "$?" -eq "0" ]
|
[ "$?" -eq "0" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
# clones the whole develop branch (Friendica and Addons)
|
# clones the whole develop branch (Friendica and Addons)
|
||||||
clone_develop() {
|
clone_develop() {
|
||||||
friendica_git="${FRIENDICA_VERSION}"
|
friendica_git="${FRIENDICA_VERSION}"
|
||||||
addons_git="${FRIENDICA_ADDONS}"
|
addons_git="${FRIENDICA_ADDONS}"
|
||||||
friendica_repo="${FRIENDICA_REPOSITORY:-friendica/friendica}"
|
friendica_repo="${FRIENDICA_REPOSITORY:-friendica/friendica}"
|
||||||
friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica/friendica-addons}"
|
friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica/friendica-addons}"
|
||||||
|
|
||||||
if echo "{$friendica_git,,}" | grep -Eq '^.*\-dev'; then
|
if echo "{$friendica_git,,}" | grep -Eq '^.*\-dev'; then
|
||||||
friendica_git="develop"
|
friendica_git="develop"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then
|
if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then
|
||||||
addons_git="develop"
|
addons_git="develop"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check if the branches exist before wiping the
|
# Check if the branches exist before wiping the
|
||||||
if check_branch "$friendica_repo" "$friendica_git" && check_branch "$friendica_addons_repo" "$addons_git" ; then
|
if check_branch "$friendica_repo" "$friendica_git" && check_branch "$friendica_addons_repo" "$addons_git" ; then
|
||||||
echo "Cloning '${friendica_git}' from GitHub repository '${friendica_repo}' ..."
|
echo "Cloning '${friendica_git}' from GitHub repository '${friendica_repo}' ..."
|
||||||
|
|
||||||
# Removing the whole directory first
|
# Removing the whole directory first
|
||||||
rm -fr /usr/src/friendica
|
rm -fr /usr/src/friendica
|
||||||
git clone -q -b ${friendica_git} "https://github.com/${friendica_repo}" /usr/src/friendica
|
git clone -q -b ${friendica_git} "https://github.com/${friendica_repo}" /usr/src/friendica
|
||||||
|
|
||||||
mkdir /usr/src/friendica/addon
|
mkdir /usr/src/friendica/addon
|
||||||
git clone -q -b ${addons_git} "https://github.com/${friendica_addons_repo}" /usr/src/friendica/addon
|
git clone -q -b ${addons_git} "https://github.com/${friendica_addons_repo}" /usr/src/friendica/addon
|
||||||
|
|
||||||
echo "Download finished"
|
echo "Download finished"
|
||||||
|
|
||||||
if [ ! -f /usr/src/friendica/VERSION ]; then
|
if [ ! -f /usr/src/friendica/VERSION ]; then
|
||||||
echo "Couldn't clone repository"
|
echo "Couldn't clone repository"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
/usr/src/friendica/bin/composer.phar install --no-dev -d /usr/src/friendica
|
/usr/src/friendica/bin/composer.phar install --no-dev -d /usr/src/friendica
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
else
|
else
|
||||||
if check_branch "$friendica_repo" "$friendica_git"; then
|
if check_branch "$friendica_repo" "$friendica_git"; then
|
||||||
echo "$friendica_repo/$friendica_git is not valid."
|
echo "$friendica_repo/$friendica_git is not valid."
|
||||||
else
|
else
|
||||||
echo "$friendica_addons_repo/$addons_git is not valid."
|
echo "$friendica_addons_repo/$addons_git is not valid."
|
||||||
fi
|
fi
|
||||||
echo "Using old version."
|
echo "Using old version."
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# just check if we execute apache or php-fpm
|
# just check if we execute apache or php-fpm
|
||||||
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
||||||
# cloning from git is just possible for develop or Release Candidats
|
# cloning from git is just possible for develop or Release Candidate
|
||||||
if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)' || [ "${FRIENDICA_UPGRADE:-false}" = "true" ] || [ ! -f /usr/src/friendica/VERSION ]; then
|
if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)' || [ "${FRIENDICA_UPGRADE:-false}" = "true" ] || [ ! -f /usr/src/friendica/VERSION ]; then
|
||||||
# just clone & check if it's a new install or upgrade
|
# just clone & check if it's a new install or upgrade
|
||||||
clone_develop
|
clone_develop
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec /entrypoint.sh "$@"
|
exec /entrypoint.sh "$@"
|
||||||
|
|
|
@ -3,147 +3,147 @@ set -eu
|
||||||
|
|
||||||
# run an command with the www-data user
|
# run an command with the www-data user
|
||||||
run_as() {
|
run_as() {
|
||||||
set -- -c "cd /var/www/html; $*"
|
set -- -c "cd /var/www/html; $*"
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
su - www-data -s /bin/sh "$@"
|
su - www-data -s /bin/sh "$@"
|
||||||
else
|
else
|
||||||
sh "$@"
|
sh "$@"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# checks if the the first parameter is greater than the second parameter
|
# checks if the the first parameter is greater than the second parameter
|
||||||
version_greater() {
|
version_greater() {
|
||||||
[ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
|
[ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
setup_ssmtp() {
|
setup_ssmtp() {
|
||||||
if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
|
if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
|
||||||
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
|
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
|
||||||
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
|
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
|
||||||
|
|
||||||
smtp_from=${SMTP_FROM:-no-reply}
|
smtp_from=${SMTP_FROM:-no-reply}
|
||||||
|
|
||||||
# Setup SSMTP
|
# Setup SSMTP
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
|
||||||
|
|
||||||
# add possible mail-senders
|
# add possible mail-senders
|
||||||
{
|
{
|
||||||
echo "www-data:$smtp_from@$SMTP_DOMAIN:$SMTP"
|
echo "www-data:$smtp_from@$SMTP_DOMAIN:$SMTP"
|
||||||
echo "root::$smtp_from@$SMTP_DOMAIN:$SMTP"
|
echo "root::$smtp_from@$SMTP_DOMAIN:$SMTP"
|
||||||
} > /etc/ssmtp/revaliases
|
} > /etc/ssmtp/revaliases
|
||||||
|
|
||||||
# replace ssmtp.conf settings
|
# replace ssmtp.conf settings
|
||||||
{
|
{
|
||||||
echo "root=:$smtp_from@$SMTP_DOMAIN"
|
echo "root=:$smtp_from@$SMTP_DOMAIN"
|
||||||
echo "hostname=$SMTP_DOMAIN"
|
echo "hostname=$SMTP_DOMAIN"
|
||||||
echo "mailhub=$SMTP"
|
echo "mailhub=$SMTP"
|
||||||
echo "FromLineOverride=YES"
|
echo "FromLineOverride=YES"
|
||||||
if [ -n "${SMTP_TLS+x}" ]; then echo "UseTLS=$SMTP_TLS"; fi
|
if [ -n "${SMTP_TLS+x}" ]; then echo "UseTLS=$SMTP_TLS"; fi
|
||||||
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "UseSTARTTLS=$SMTP_STARTTLS"; fi
|
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "UseSTARTTLS=$SMTP_STARTTLS"; fi
|
||||||
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "AuthUser=$SMTP_AUTH_USER"; fi
|
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "AuthUser=$SMTP_AUTH_USER"; fi
|
||||||
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "AuthPass=$SMTP_AUTH_PASS";fi
|
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "AuthPass=$SMTP_AUTH_PASS";fi
|
||||||
if [ -n "${SMTP_AUTH_METHOD+x}" ]; then echo "AuthMethod=$SMTP_AUTH_METHOD"; fi
|
if [ -n "${SMTP_AUTH_METHOD+x}" ]; then echo "AuthMethod=$SMTP_AUTH_METHOD"; fi
|
||||||
} > /etc/ssmtp/ssmtp.conf
|
} > /etc/ssmtp/ssmtp.conf
|
||||||
|
|
||||||
echo "Setup finished"
|
echo "Setup finished"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# just check if we execute apache or php-fpm
|
# just check if we execute apache or php-fpm
|
||||||
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
||||||
installed_version="0.0.0.0"
|
installed_version="0.0.0.0"
|
||||||
if [ -f /var/www/html/VERSION ]; then
|
if [ -f /var/www/html/VERSION ]; then
|
||||||
installed_version="$(cat /var/www/html/VERSION)"
|
installed_version="$(cat /var/www/html/VERSION)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
image_version="$(cat /usr/src/friendica/VERSION)"
|
image_version="$(cat /usr/src/friendica/VERSION)"
|
||||||
|
|
||||||
# no downgrading possible
|
# no downgrading possible
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
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)"
|
echo "Can't copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ($image_version)"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
setup_ssmtp
|
setup_ssmtp
|
||||||
|
|
||||||
# check it just in case the version is greater or if we force the upgrade
|
# check it just in case the version is greater or if we force the upgrade
|
||||||
if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
|
if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
|
||||||
echo "Initializing Friendica $image_version ..."
|
echo "Initializing Friendica $image_version ..."
|
||||||
|
|
||||||
if [ "$installed_version" != "0.0.0.0" ]; then
|
if [ "$installed_version" != "0.0.0.0" ]; then
|
||||||
echo "Upgrading Friendica from $installed_version ..."
|
echo "Upgrading Friendica from $installed_version ..."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
rsync_options="-rlDog --chown=www-data:www-data"
|
rsync_options="-rlDog --chown=www-data:www-data"
|
||||||
else
|
else
|
||||||
rsync_options="-rlD"
|
rsync_options="-rlD"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
|
rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
|
||||||
|
|
||||||
# Update docker-based config files, but never delete other config files
|
# Update docker-based config files, but never delete other config files
|
||||||
rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
|
rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
|
||||||
|
|
||||||
# In case there is no .htaccess, copy it from the default dist file
|
# In case there is no .htaccess, copy it from the default dist file
|
||||||
if [ ! -f "/var/www/html/.htaccess" ]; then
|
if [ ! -f "/var/www/html/.htaccess" ]; then
|
||||||
cp "/var/www/html/.htaccess-dist" "/var/www/html/.htaccess"
|
cp "/var/www/html/.htaccess-dist" "/var/www/html/.htaccess"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d /var/www/html/view/smarty3 ]; then
|
if [ -d /var/www/html/view/smarty3 ]; then
|
||||||
chmod -R 777 /var/www/html/view/smarty3
|
chmod -R 777 /var/www/html/view/smarty3
|
||||||
fi
|
fi
|
||||||
echo "Initializing finished"
|
echo "Initializing finished"
|
||||||
|
|
||||||
# install
|
# install
|
||||||
if [ "$installed_version" = "0.0.0.0" ]; then
|
if [ "$installed_version" = "0.0.0.0" ]; then
|
||||||
echo "New Friendica instance"
|
echo "New Friendica instance"
|
||||||
|
|
||||||
install=false
|
install=false
|
||||||
if [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${FRIENDICA_ADMIN_MAIL+x}" ] && [ -n "${FRIENDICA_URL+x}" ]; then
|
if [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${FRIENDICA_ADMIN_MAIL+x}" ] && [ -n "${FRIENDICA_URL+x}" ]; then
|
||||||
echo "Installation with environment variables"
|
echo "Installation with environment variables"
|
||||||
|
|
||||||
FRIENDICA_TZ=${FRIENDICA_TZ:-America/LosAngeles}
|
FRIENDICA_TZ=${FRIENDICA_TZ:-America/LosAngeles}
|
||||||
FRIENDICA_LANG=${FRIENDICA_LANG:-en}
|
FRIENDICA_LANG=${FRIENDICA_LANG:-en}
|
||||||
MYSQL_PORT=${MYSQL_PORT:-3306}
|
MYSQL_PORT=${MYSQL_PORT:-3306}
|
||||||
|
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
install_options='-s --dbhost "'$MYSQL_HOST'" --dbport "'$MYSQL_PORT'" --dbdata "'$MYSQL_DATABASE'" --dbuser "'$MYSQL_USER'" --dbpass "'$MYSQL_PASSWORD'"'
|
install_options='-s --dbhost "'$MYSQL_HOST'" --dbport "'$MYSQL_PORT'" --dbdata "'$MYSQL_DATABASE'" --dbuser "'$MYSQL_USER'" --dbpass "'$MYSQL_PASSWORD'"'
|
||||||
|
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'" --url "'$FRIENDICA_URL'"'
|
install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'" --url "'$FRIENDICA_URL'"'
|
||||||
install=true
|
install=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$install" = true ]; then
|
if [ "$install" = true ]; then
|
||||||
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
||||||
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
|
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
|
||||||
|
|
||||||
echo "Starting Friendica installation ..."
|
echo "Starting Friendica installation ..."
|
||||||
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
|
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
|
||||||
|
|
||||||
rm -fr /var/www/html/view/smarty3/compiled
|
rm -fr /var/www/html/view/smarty3/compiled
|
||||||
|
|
||||||
# load other config files (*.config.php) to the config folder
|
# load other config files (*.config.php) to the config folder
|
||||||
if [ -d "/usr/src/config" ]; then
|
if [ -d "/usr/src/config" ]; then
|
||||||
rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
|
rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Installation finished"
|
echo "Installation finished"
|
||||||
else
|
else
|
||||||
echo "[ERROR] Waited 300 seconds, no response" >&2
|
echo "[ERROR] Waited 300 seconds, no response" >&2
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "Running web-based installer on first connect!"
|
echo "Running web-based installer on first connect!"
|
||||||
fi
|
fi
|
||||||
# upgrade
|
# upgrade
|
||||||
else
|
else
|
||||||
echo "Upgrading Friendica ..."
|
echo "Upgrading Friendica ..."
|
||||||
run_as 'php /var/www/html/bin/console.php dbstructure update'
|
run_as 'php /var/www/html/bin/console.php dbstructure update'
|
||||||
echo "Upgrading finished"
|
echo "Upgrading finished"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
|
@ -42,12 +42,12 @@ RUN set -ex; \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
pdo_mysql \
|
pdo_mysql \
|
||||||
gd \
|
gd \
|
||||||
zip \
|
zip \
|
||||||
opcache \
|
opcache \
|
||||||
pcntl \
|
pcntl \
|
||||||
ldap \
|
ldap \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
# pecl will claim success even if one install fails, so we need to perform each install separately
|
# pecl will claim success even if one install fails, so we need to perform each install separately
|
||||||
|
@ -57,17 +57,17 @@ RUN set -ex; \
|
||||||
pecl install imagick-3.4.4; \
|
pecl install imagick-3.4.4; \
|
||||||
\
|
\
|
||||||
docker-php-ext-enable \
|
docker-php-ext-enable \
|
||||||
apcu \
|
apcu \
|
||||||
memcached \
|
memcached \
|
||||||
redis \
|
redis \
|
||||||
imagick \
|
imagick \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
runDeps="$( \
|
runDeps="$( \
|
||||||
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
|
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
|
||||||
| tr ',' '\n' \
|
| tr ',' '\n' \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| awk 'system("[ -e /usr/local/lib" $1 " ]") == 0 { next } { print "so:" $1 }' \
|
| awk 'system("[ -e /usr/local/lib" $1 " ]") == 0 { next } { print "so:" $1 }' \
|
||||||
)"; \
|
)"; \
|
||||||
apk add --no-network --virtual .friendica-phpext-rundeps $runDeps; \
|
apk add --no-network --virtual .friendica-phpext-rundeps $runDeps; \
|
||||||
apk del --no-network .build-deps;
|
apk del --no-network .build-deps;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
trap "break;exit" HUP INT TERM
|
trap "break;exit" HUP INT TERM
|
||||||
|
|
||||||
while [ ! -f /var/www/html/bin/daemon.php ]; do
|
while [ ! -f /var/www/html/bin/daemon.php ]; do
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
||||||
|
|
|
@ -3,67 +3,67 @@ set -eu
|
||||||
|
|
||||||
# checks if the branch and repository exists
|
# checks if the branch and repository exists
|
||||||
check_branch() {
|
check_branch() {
|
||||||
repo=${1:-}
|
repo=${1:-}
|
||||||
branch=${2:-}
|
branch=${2:-}
|
||||||
git ls-remote --heads --tags "https://github.com/$repo" | grep -E "refs/(heads|tags)/${branch}$" >/dev/null
|
git ls-remote --heads --tags "https://github.com/$repo" | grep -E "refs/(heads|tags)/${branch}$" >/dev/null
|
||||||
[ "$?" -eq "0" ]
|
[ "$?" -eq "0" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
# clones the whole develop branch (Friendica and Addons)
|
# clones the whole develop branch (Friendica and Addons)
|
||||||
clone_develop() {
|
clone_develop() {
|
||||||
friendica_git="${FRIENDICA_VERSION}"
|
friendica_git="${FRIENDICA_VERSION}"
|
||||||
addons_git="${FRIENDICA_ADDONS}"
|
addons_git="${FRIENDICA_ADDONS}"
|
||||||
friendica_repo="${FRIENDICA_REPOSITORY:-friendica/friendica}"
|
friendica_repo="${FRIENDICA_REPOSITORY:-friendica/friendica}"
|
||||||
friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica/friendica-addons}"
|
friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica/friendica-addons}"
|
||||||
|
|
||||||
if echo "{$friendica_git,,}" | grep -Eq '^.*\-dev'; then
|
if echo "{$friendica_git,,}" | grep -Eq '^.*\-dev'; then
|
||||||
friendica_git="develop"
|
friendica_git="develop"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then
|
if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then
|
||||||
addons_git="develop"
|
addons_git="develop"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check if the branches exist before wiping the
|
# Check if the branches exist before wiping the
|
||||||
if check_branch "$friendica_repo" "$friendica_git" && check_branch "$friendica_addons_repo" "$addons_git" ; then
|
if check_branch "$friendica_repo" "$friendica_git" && check_branch "$friendica_addons_repo" "$addons_git" ; then
|
||||||
echo "Cloning '${friendica_git}' from GitHub repository '${friendica_repo}' ..."
|
echo "Cloning '${friendica_git}' from GitHub repository '${friendica_repo}' ..."
|
||||||
|
|
||||||
# Removing the whole directory first
|
# Removing the whole directory first
|
||||||
rm -fr /usr/src/friendica
|
rm -fr /usr/src/friendica
|
||||||
git clone -q -b ${friendica_git} "https://github.com/${friendica_repo}" /usr/src/friendica
|
git clone -q -b ${friendica_git} "https://github.com/${friendica_repo}" /usr/src/friendica
|
||||||
|
|
||||||
mkdir /usr/src/friendica/addon
|
mkdir /usr/src/friendica/addon
|
||||||
git clone -q -b ${addons_git} "https://github.com/${friendica_addons_repo}" /usr/src/friendica/addon
|
git clone -q -b ${addons_git} "https://github.com/${friendica_addons_repo}" /usr/src/friendica/addon
|
||||||
|
|
||||||
echo "Download finished"
|
echo "Download finished"
|
||||||
|
|
||||||
if [ ! -f /usr/src/friendica/VERSION ]; then
|
if [ ! -f /usr/src/friendica/VERSION ]; then
|
||||||
echo "Couldn't clone repository"
|
echo "Couldn't clone repository"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
/usr/src/friendica/bin/composer.phar install --no-dev -d /usr/src/friendica
|
/usr/src/friendica/bin/composer.phar install --no-dev -d /usr/src/friendica
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
else
|
else
|
||||||
if check_branch "$friendica_repo" "$friendica_git"; then
|
if check_branch "$friendica_repo" "$friendica_git"; then
|
||||||
echo "$friendica_repo/$friendica_git is not valid."
|
echo "$friendica_repo/$friendica_git is not valid."
|
||||||
else
|
else
|
||||||
echo "$friendica_addons_repo/$addons_git is not valid."
|
echo "$friendica_addons_repo/$addons_git is not valid."
|
||||||
fi
|
fi
|
||||||
echo "Using old version."
|
echo "Using old version."
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# just check if we execute apache or php-fpm
|
# just check if we execute apache or php-fpm
|
||||||
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
||||||
# cloning from git is just possible for develop or Release Candidats
|
# cloning from git is just possible for develop or Release Candidate
|
||||||
if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)' || [ "${FRIENDICA_UPGRADE:-false}" = "true" ] || [ ! -f /usr/src/friendica/VERSION ]; then
|
if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)' || [ "${FRIENDICA_UPGRADE:-false}" = "true" ] || [ ! -f /usr/src/friendica/VERSION ]; then
|
||||||
# just clone & check if it's a new install or upgrade
|
# just clone & check if it's a new install or upgrade
|
||||||
clone_develop
|
clone_develop
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec /entrypoint.sh "$@"
|
exec /entrypoint.sh "$@"
|
||||||
|
|
|
@ -3,147 +3,147 @@ set -eu
|
||||||
|
|
||||||
# run an command with the www-data user
|
# run an command with the www-data user
|
||||||
run_as() {
|
run_as() {
|
||||||
set -- -c "cd /var/www/html; $*"
|
set -- -c "cd /var/www/html; $*"
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
su - www-data -s /bin/sh "$@"
|
su - www-data -s /bin/sh "$@"
|
||||||
else
|
else
|
||||||
sh "$@"
|
sh "$@"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# checks if the the first parameter is greater than the second parameter
|
# checks if the the first parameter is greater than the second parameter
|
||||||
version_greater() {
|
version_greater() {
|
||||||
[ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
|
[ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
setup_ssmtp() {
|
setup_ssmtp() {
|
||||||
if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
|
if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
|
||||||
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
|
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
|
||||||
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
|
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
|
||||||
|
|
||||||
smtp_from=${SMTP_FROM:-no-reply}
|
smtp_from=${SMTP_FROM:-no-reply}
|
||||||
|
|
||||||
# Setup SSMTP
|
# Setup SSMTP
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
|
||||||
|
|
||||||
# add possible mail-senders
|
# add possible mail-senders
|
||||||
{
|
{
|
||||||
echo "www-data:$smtp_from@$SMTP_DOMAIN:$SMTP"
|
echo "www-data:$smtp_from@$SMTP_DOMAIN:$SMTP"
|
||||||
echo "root::$smtp_from@$SMTP_DOMAIN:$SMTP"
|
echo "root::$smtp_from@$SMTP_DOMAIN:$SMTP"
|
||||||
} > /etc/ssmtp/revaliases
|
} > /etc/ssmtp/revaliases
|
||||||
|
|
||||||
# replace ssmtp.conf settings
|
# replace ssmtp.conf settings
|
||||||
{
|
{
|
||||||
echo "root=:$smtp_from@$SMTP_DOMAIN"
|
echo "root=:$smtp_from@$SMTP_DOMAIN"
|
||||||
echo "hostname=$SMTP_DOMAIN"
|
echo "hostname=$SMTP_DOMAIN"
|
||||||
echo "mailhub=$SMTP"
|
echo "mailhub=$SMTP"
|
||||||
echo "FromLineOverride=YES"
|
echo "FromLineOverride=YES"
|
||||||
if [ -n "${SMTP_TLS+x}" ]; then echo "UseTLS=$SMTP_TLS"; fi
|
if [ -n "${SMTP_TLS+x}" ]; then echo "UseTLS=$SMTP_TLS"; fi
|
||||||
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "UseSTARTTLS=$SMTP_STARTTLS"; fi
|
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "UseSTARTTLS=$SMTP_STARTTLS"; fi
|
||||||
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "AuthUser=$SMTP_AUTH_USER"; fi
|
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "AuthUser=$SMTP_AUTH_USER"; fi
|
||||||
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "AuthPass=$SMTP_AUTH_PASS";fi
|
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "AuthPass=$SMTP_AUTH_PASS";fi
|
||||||
if [ -n "${SMTP_AUTH_METHOD+x}" ]; then echo "AuthMethod=$SMTP_AUTH_METHOD"; fi
|
if [ -n "${SMTP_AUTH_METHOD+x}" ]; then echo "AuthMethod=$SMTP_AUTH_METHOD"; fi
|
||||||
} > /etc/ssmtp/ssmtp.conf
|
} > /etc/ssmtp/ssmtp.conf
|
||||||
|
|
||||||
echo "Setup finished"
|
echo "Setup finished"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# just check if we execute apache or php-fpm
|
# just check if we execute apache or php-fpm
|
||||||
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
||||||
installed_version="0.0.0.0"
|
installed_version="0.0.0.0"
|
||||||
if [ -f /var/www/html/VERSION ]; then
|
if [ -f /var/www/html/VERSION ]; then
|
||||||
installed_version="$(cat /var/www/html/VERSION)"
|
installed_version="$(cat /var/www/html/VERSION)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
image_version="$(cat /usr/src/friendica/VERSION)"
|
image_version="$(cat /usr/src/friendica/VERSION)"
|
||||||
|
|
||||||
# no downgrading possible
|
# no downgrading possible
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
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)"
|
echo "Can't copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ($image_version)"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
setup_ssmtp
|
setup_ssmtp
|
||||||
|
|
||||||
# check it just in case the version is greater or if we force the upgrade
|
# check it just in case the version is greater or if we force the upgrade
|
||||||
if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
|
if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
|
||||||
echo "Initializing Friendica $image_version ..."
|
echo "Initializing Friendica $image_version ..."
|
||||||
|
|
||||||
if [ "$installed_version" != "0.0.0.0" ]; then
|
if [ "$installed_version" != "0.0.0.0" ]; then
|
||||||
echo "Upgrading Friendica from $installed_version ..."
|
echo "Upgrading Friendica from $installed_version ..."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
rsync_options="-rlDog --chown=www-data:www-data"
|
rsync_options="-rlDog --chown=www-data:www-data"
|
||||||
else
|
else
|
||||||
rsync_options="-rlD"
|
rsync_options="-rlD"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
|
rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
|
||||||
|
|
||||||
# Update docker-based config files, but never delete other config files
|
# Update docker-based config files, but never delete other config files
|
||||||
rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
|
rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
|
||||||
|
|
||||||
# In case there is no .htaccess, copy it from the default dist file
|
# In case there is no .htaccess, copy it from the default dist file
|
||||||
if [ ! -f "/var/www/html/.htaccess" ]; then
|
if [ ! -f "/var/www/html/.htaccess" ]; then
|
||||||
cp "/var/www/html/.htaccess-dist" "/var/www/html/.htaccess"
|
cp "/var/www/html/.htaccess-dist" "/var/www/html/.htaccess"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d /var/www/html/view/smarty3 ]; then
|
if [ -d /var/www/html/view/smarty3 ]; then
|
||||||
chmod -R 777 /var/www/html/view/smarty3
|
chmod -R 777 /var/www/html/view/smarty3
|
||||||
fi
|
fi
|
||||||
echo "Initializing finished"
|
echo "Initializing finished"
|
||||||
|
|
||||||
# install
|
# install
|
||||||
if [ "$installed_version" = "0.0.0.0" ]; then
|
if [ "$installed_version" = "0.0.0.0" ]; then
|
||||||
echo "New Friendica instance"
|
echo "New Friendica instance"
|
||||||
|
|
||||||
install=false
|
install=false
|
||||||
if [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${FRIENDICA_ADMIN_MAIL+x}" ] && [ -n "${FRIENDICA_URL+x}" ]; then
|
if [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${FRIENDICA_ADMIN_MAIL+x}" ] && [ -n "${FRIENDICA_URL+x}" ]; then
|
||||||
echo "Installation with environment variables"
|
echo "Installation with environment variables"
|
||||||
|
|
||||||
FRIENDICA_TZ=${FRIENDICA_TZ:-America/LosAngeles}
|
FRIENDICA_TZ=${FRIENDICA_TZ:-America/LosAngeles}
|
||||||
FRIENDICA_LANG=${FRIENDICA_LANG:-en}
|
FRIENDICA_LANG=${FRIENDICA_LANG:-en}
|
||||||
MYSQL_PORT=${MYSQL_PORT:-3306}
|
MYSQL_PORT=${MYSQL_PORT:-3306}
|
||||||
|
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
install_options='-s --dbhost "'$MYSQL_HOST'" --dbport "'$MYSQL_PORT'" --dbdata "'$MYSQL_DATABASE'" --dbuser "'$MYSQL_USER'" --dbpass "'$MYSQL_PASSWORD'"'
|
install_options='-s --dbhost "'$MYSQL_HOST'" --dbport "'$MYSQL_PORT'" --dbdata "'$MYSQL_DATABASE'" --dbuser "'$MYSQL_USER'" --dbpass "'$MYSQL_PASSWORD'"'
|
||||||
|
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'" --url "'$FRIENDICA_URL'"'
|
install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'" --url "'$FRIENDICA_URL'"'
|
||||||
install=true
|
install=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$install" = true ]; then
|
if [ "$install" = true ]; then
|
||||||
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
||||||
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
|
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
|
||||||
|
|
||||||
echo "Starting Friendica installation ..."
|
echo "Starting Friendica installation ..."
|
||||||
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
|
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
|
||||||
|
|
||||||
rm -fr /var/www/html/view/smarty3/compiled
|
rm -fr /var/www/html/view/smarty3/compiled
|
||||||
|
|
||||||
# load other config files (*.config.php) to the config folder
|
# load other config files (*.config.php) to the config folder
|
||||||
if [ -d "/usr/src/config" ]; then
|
if [ -d "/usr/src/config" ]; then
|
||||||
rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
|
rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Installation finished"
|
echo "Installation finished"
|
||||||
else
|
else
|
||||||
echo "[ERROR] Waited 300 seconds, no response" >&2
|
echo "[ERROR] Waited 300 seconds, no response" >&2
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "Running web-based installer on first connect!"
|
echo "Running web-based installer on first connect!"
|
||||||
fi
|
fi
|
||||||
# upgrade
|
# upgrade
|
||||||
else
|
else
|
||||||
echo "Upgrading Friendica ..."
|
echo "Upgrading Friendica ..."
|
||||||
run_as 'php /var/www/html/bin/console.php dbstructure update'
|
run_as 'php /var/www/html/bin/console.php dbstructure update'
|
||||||
echo "Upgrading finished"
|
echo "Upgrading finished"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
|
@ -56,8 +56,8 @@ RUN set -ex; \
|
||||||
--with-jpeg-dir=/usr/include/ \
|
--with-jpeg-dir=/usr/include/ \
|
||||||
; \
|
; \
|
||||||
docker-php-ext-configure ldap \
|
docker-php-ext-configure ldap \
|
||||||
--with-libdir=lib/$debMultiarch/ \
|
--with-libdir=lib/$debMultiarch/ \
|
||||||
; \
|
;\
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
pdo_mysql \
|
pdo_mysql \
|
||||||
gd \
|
gd \
|
||||||
|
@ -85,12 +85,12 @@ RUN set -ex; \
|
||||||
apt-mark auto '.*' > /dev/null; \
|
apt-mark auto '.*' > /dev/null; \
|
||||||
apt-mark manual $savedAptMark; \
|
apt-mark manual $savedAptMark; \
|
||||||
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
|
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
|
||||||
| awk '/=>/ { print $3 }' \
|
| awk '/=>/ { print $3 }' \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs -r dpkg-query -S \
|
| xargs -r dpkg-query -S \
|
||||||
| cut -d: -f1 \
|
| cut -d: -f1 \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs -rt apt-mark manual; \
|
| xargs -rt apt-mark manual; \
|
||||||
\
|
\
|
||||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
trap "break;exit" HUP INT TERM
|
trap "break;exit" HUP INT TERM
|
||||||
|
|
||||||
while [ ! -f /var/www/html/bin/daemon.php ]; do
|
while [ ! -f /var/www/html/bin/daemon.php ]; do
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
||||||
|
|
|
@ -3,67 +3,67 @@ set -eu
|
||||||
|
|
||||||
# checks if the branch and repository exists
|
# checks if the branch and repository exists
|
||||||
check_branch() {
|
check_branch() {
|
||||||
repo=${1:-}
|
repo=${1:-}
|
||||||
branch=${2:-}
|
branch=${2:-}
|
||||||
git ls-remote --heads --tags "https://github.com/$repo" | grep -E "refs/(heads|tags)/${branch}$" >/dev/null
|
git ls-remote --heads --tags "https://github.com/$repo" | grep -E "refs/(heads|tags)/${branch}$" >/dev/null
|
||||||
[ "$?" -eq "0" ]
|
[ "$?" -eq "0" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
# clones the whole develop branch (Friendica and Addons)
|
# clones the whole develop branch (Friendica and Addons)
|
||||||
clone_develop() {
|
clone_develop() {
|
||||||
friendica_git="${FRIENDICA_VERSION}"
|
friendica_git="${FRIENDICA_VERSION}"
|
||||||
addons_git="${FRIENDICA_ADDONS}"
|
addons_git="${FRIENDICA_ADDONS}"
|
||||||
friendica_repo="${FRIENDICA_REPOSITORY:-friendica/friendica}"
|
friendica_repo="${FRIENDICA_REPOSITORY:-friendica/friendica}"
|
||||||
friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica/friendica-addons}"
|
friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica/friendica-addons}"
|
||||||
|
|
||||||
if echo "{$friendica_git,,}" | grep -Eq '^.*\-dev'; then
|
if echo "{$friendica_git,,}" | grep -Eq '^.*\-dev'; then
|
||||||
friendica_git="develop"
|
friendica_git="develop"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then
|
if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then
|
||||||
addons_git="develop"
|
addons_git="develop"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check if the branches exist before wiping the
|
# Check if the branches exist before wiping the
|
||||||
if check_branch "$friendica_repo" "$friendica_git" && check_branch "$friendica_addons_repo" "$addons_git" ; then
|
if check_branch "$friendica_repo" "$friendica_git" && check_branch "$friendica_addons_repo" "$addons_git" ; then
|
||||||
echo "Cloning '${friendica_git}' from GitHub repository '${friendica_repo}' ..."
|
echo "Cloning '${friendica_git}' from GitHub repository '${friendica_repo}' ..."
|
||||||
|
|
||||||
# Removing the whole directory first
|
# Removing the whole directory first
|
||||||
rm -fr /usr/src/friendica
|
rm -fr /usr/src/friendica
|
||||||
git clone -q -b ${friendica_git} "https://github.com/${friendica_repo}" /usr/src/friendica
|
git clone -q -b ${friendica_git} "https://github.com/${friendica_repo}" /usr/src/friendica
|
||||||
|
|
||||||
mkdir /usr/src/friendica/addon
|
mkdir /usr/src/friendica/addon
|
||||||
git clone -q -b ${addons_git} "https://github.com/${friendica_addons_repo}" /usr/src/friendica/addon
|
git clone -q -b ${addons_git} "https://github.com/${friendica_addons_repo}" /usr/src/friendica/addon
|
||||||
|
|
||||||
echo "Download finished"
|
echo "Download finished"
|
||||||
|
|
||||||
if [ ! -f /usr/src/friendica/VERSION ]; then
|
if [ ! -f /usr/src/friendica/VERSION ]; then
|
||||||
echo "Couldn't clone repository"
|
echo "Couldn't clone repository"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
/usr/src/friendica/bin/composer.phar install --no-dev -d /usr/src/friendica
|
/usr/src/friendica/bin/composer.phar install --no-dev -d /usr/src/friendica
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
else
|
else
|
||||||
if check_branch "$friendica_repo" "$friendica_git"; then
|
if check_branch "$friendica_repo" "$friendica_git"; then
|
||||||
echo "$friendica_repo/$friendica_git is not valid."
|
echo "$friendica_repo/$friendica_git is not valid."
|
||||||
else
|
else
|
||||||
echo "$friendica_addons_repo/$addons_git is not valid."
|
echo "$friendica_addons_repo/$addons_git is not valid."
|
||||||
fi
|
fi
|
||||||
echo "Using old version."
|
echo "Using old version."
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# just check if we execute apache or php-fpm
|
# just check if we execute apache or php-fpm
|
||||||
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
||||||
# cloning from git is just possible for develop or Release Candidats
|
# cloning from git is just possible for develop or Release Candidate
|
||||||
if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)' || [ "${FRIENDICA_UPGRADE:-false}" = "true" ] || [ ! -f /usr/src/friendica/VERSION ]; then
|
if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)' || [ "${FRIENDICA_UPGRADE:-false}" = "true" ] || [ ! -f /usr/src/friendica/VERSION ]; then
|
||||||
# just clone & check if it's a new install or upgrade
|
# just clone & check if it's a new install or upgrade
|
||||||
clone_develop
|
clone_develop
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec /entrypoint.sh "$@"
|
exec /entrypoint.sh "$@"
|
||||||
|
|
|
@ -3,147 +3,147 @@ set -eu
|
||||||
|
|
||||||
# run an command with the www-data user
|
# run an command with the www-data user
|
||||||
run_as() {
|
run_as() {
|
||||||
set -- -c "cd /var/www/html; $*"
|
set -- -c "cd /var/www/html; $*"
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
su - www-data -s /bin/sh "$@"
|
su - www-data -s /bin/sh "$@"
|
||||||
else
|
else
|
||||||
sh "$@"
|
sh "$@"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# checks if the the first parameter is greater than the second parameter
|
# checks if the the first parameter is greater than the second parameter
|
||||||
version_greater() {
|
version_greater() {
|
||||||
[ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
|
[ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
setup_ssmtp() {
|
setup_ssmtp() {
|
||||||
if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
|
if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
|
||||||
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
|
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
|
||||||
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
|
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
|
||||||
|
|
||||||
smtp_from=${SMTP_FROM:-no-reply}
|
smtp_from=${SMTP_FROM:-no-reply}
|
||||||
|
|
||||||
# Setup SSMTP
|
# Setup SSMTP
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
|
||||||
|
|
||||||
# add possible mail-senders
|
# add possible mail-senders
|
||||||
{
|
{
|
||||||
echo "www-data:$smtp_from@$SMTP_DOMAIN:$SMTP"
|
echo "www-data:$smtp_from@$SMTP_DOMAIN:$SMTP"
|
||||||
echo "root::$smtp_from@$SMTP_DOMAIN:$SMTP"
|
echo "root::$smtp_from@$SMTP_DOMAIN:$SMTP"
|
||||||
} > /etc/ssmtp/revaliases
|
} > /etc/ssmtp/revaliases
|
||||||
|
|
||||||
# replace ssmtp.conf settings
|
# replace ssmtp.conf settings
|
||||||
{
|
{
|
||||||
echo "root=:$smtp_from@$SMTP_DOMAIN"
|
echo "root=:$smtp_from@$SMTP_DOMAIN"
|
||||||
echo "hostname=$SMTP_DOMAIN"
|
echo "hostname=$SMTP_DOMAIN"
|
||||||
echo "mailhub=$SMTP"
|
echo "mailhub=$SMTP"
|
||||||
echo "FromLineOverride=YES"
|
echo "FromLineOverride=YES"
|
||||||
if [ -n "${SMTP_TLS+x}" ]; then echo "UseTLS=$SMTP_TLS"; fi
|
if [ -n "${SMTP_TLS+x}" ]; then echo "UseTLS=$SMTP_TLS"; fi
|
||||||
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "UseSTARTTLS=$SMTP_STARTTLS"; fi
|
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "UseSTARTTLS=$SMTP_STARTTLS"; fi
|
||||||
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "AuthUser=$SMTP_AUTH_USER"; fi
|
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "AuthUser=$SMTP_AUTH_USER"; fi
|
||||||
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "AuthPass=$SMTP_AUTH_PASS";fi
|
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "AuthPass=$SMTP_AUTH_PASS";fi
|
||||||
if [ -n "${SMTP_AUTH_METHOD+x}" ]; then echo "AuthMethod=$SMTP_AUTH_METHOD"; fi
|
if [ -n "${SMTP_AUTH_METHOD+x}" ]; then echo "AuthMethod=$SMTP_AUTH_METHOD"; fi
|
||||||
} > /etc/ssmtp/ssmtp.conf
|
} > /etc/ssmtp/ssmtp.conf
|
||||||
|
|
||||||
echo "Setup finished"
|
echo "Setup finished"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# just check if we execute apache or php-fpm
|
# just check if we execute apache or php-fpm
|
||||||
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
||||||
installed_version="0.0.0.0"
|
installed_version="0.0.0.0"
|
||||||
if [ -f /var/www/html/VERSION ]; then
|
if [ -f /var/www/html/VERSION ]; then
|
||||||
installed_version="$(cat /var/www/html/VERSION)"
|
installed_version="$(cat /var/www/html/VERSION)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
image_version="$(cat /usr/src/friendica/VERSION)"
|
image_version="$(cat /usr/src/friendica/VERSION)"
|
||||||
|
|
||||||
# no downgrading possible
|
# no downgrading possible
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
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)"
|
echo "Can't copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ($image_version)"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
setup_ssmtp
|
setup_ssmtp
|
||||||
|
|
||||||
# check it just in case the version is greater or if we force the upgrade
|
# check it just in case the version is greater or if we force the upgrade
|
||||||
if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
|
if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
|
||||||
echo "Initializing Friendica $image_version ..."
|
echo "Initializing Friendica $image_version ..."
|
||||||
|
|
||||||
if [ "$installed_version" != "0.0.0.0" ]; then
|
if [ "$installed_version" != "0.0.0.0" ]; then
|
||||||
echo "Upgrading Friendica from $installed_version ..."
|
echo "Upgrading Friendica from $installed_version ..."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
rsync_options="-rlDog --chown=www-data:www-data"
|
rsync_options="-rlDog --chown=www-data:www-data"
|
||||||
else
|
else
|
||||||
rsync_options="-rlD"
|
rsync_options="-rlD"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
|
rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
|
||||||
|
|
||||||
# Update docker-based config files, but never delete other config files
|
# Update docker-based config files, but never delete other config files
|
||||||
rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
|
rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
|
||||||
|
|
||||||
# In case there is no .htaccess, copy it from the default dist file
|
# In case there is no .htaccess, copy it from the default dist file
|
||||||
if [ ! -f "/var/www/html/.htaccess" ]; then
|
if [ ! -f "/var/www/html/.htaccess" ]; then
|
||||||
cp "/var/www/html/.htaccess-dist" "/var/www/html/.htaccess"
|
cp "/var/www/html/.htaccess-dist" "/var/www/html/.htaccess"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d /var/www/html/view/smarty3 ]; then
|
if [ -d /var/www/html/view/smarty3 ]; then
|
||||||
chmod -R 777 /var/www/html/view/smarty3
|
chmod -R 777 /var/www/html/view/smarty3
|
||||||
fi
|
fi
|
||||||
echo "Initializing finished"
|
echo "Initializing finished"
|
||||||
|
|
||||||
# install
|
# install
|
||||||
if [ "$installed_version" = "0.0.0.0" ]; then
|
if [ "$installed_version" = "0.0.0.0" ]; then
|
||||||
echo "New Friendica instance"
|
echo "New Friendica instance"
|
||||||
|
|
||||||
install=false
|
install=false
|
||||||
if [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${FRIENDICA_ADMIN_MAIL+x}" ] && [ -n "${FRIENDICA_URL+x}" ]; then
|
if [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${FRIENDICA_ADMIN_MAIL+x}" ] && [ -n "${FRIENDICA_URL+x}" ]; then
|
||||||
echo "Installation with environment variables"
|
echo "Installation with environment variables"
|
||||||
|
|
||||||
FRIENDICA_TZ=${FRIENDICA_TZ:-America/LosAngeles}
|
FRIENDICA_TZ=${FRIENDICA_TZ:-America/LosAngeles}
|
||||||
FRIENDICA_LANG=${FRIENDICA_LANG:-en}
|
FRIENDICA_LANG=${FRIENDICA_LANG:-en}
|
||||||
MYSQL_PORT=${MYSQL_PORT:-3306}
|
MYSQL_PORT=${MYSQL_PORT:-3306}
|
||||||
|
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
install_options='-s --dbhost "'$MYSQL_HOST'" --dbport "'$MYSQL_PORT'" --dbdata "'$MYSQL_DATABASE'" --dbuser "'$MYSQL_USER'" --dbpass "'$MYSQL_PASSWORD'"'
|
install_options='-s --dbhost "'$MYSQL_HOST'" --dbport "'$MYSQL_PORT'" --dbdata "'$MYSQL_DATABASE'" --dbuser "'$MYSQL_USER'" --dbpass "'$MYSQL_PASSWORD'"'
|
||||||
|
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'" --url "'$FRIENDICA_URL'"'
|
install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'" --url "'$FRIENDICA_URL'"'
|
||||||
install=true
|
install=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$install" = true ]; then
|
if [ "$install" = true ]; then
|
||||||
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
||||||
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
|
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
|
||||||
|
|
||||||
echo "Starting Friendica installation ..."
|
echo "Starting Friendica installation ..."
|
||||||
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
|
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
|
||||||
|
|
||||||
rm -fr /var/www/html/view/smarty3/compiled
|
rm -fr /var/www/html/view/smarty3/compiled
|
||||||
|
|
||||||
# load other config files (*.config.php) to the config folder
|
# load other config files (*.config.php) to the config folder
|
||||||
if [ -d "/usr/src/config" ]; then
|
if [ -d "/usr/src/config" ]; then
|
||||||
rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
|
rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Installation finished"
|
echo "Installation finished"
|
||||||
else
|
else
|
||||||
echo "[ERROR] Waited 300 seconds, no response" >&2
|
echo "[ERROR] Waited 300 seconds, no response" >&2
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "Running web-based installer on first connect!"
|
echo "Running web-based installer on first connect!"
|
||||||
fi
|
fi
|
||||||
# upgrade
|
# upgrade
|
||||||
else
|
else
|
||||||
echo "Upgrading Friendica ..."
|
echo "Upgrading Friendica ..."
|
||||||
run_as 'php /var/www/html/bin/console.php dbstructure update'
|
run_as 'php /var/www/html/bin/console.php dbstructure update'
|
||||||
echo "Upgrading finished"
|
echo "Upgrading finished"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
|
@ -56,8 +56,8 @@ RUN set -ex; \
|
||||||
--with-jpeg-dir=/usr/include/ \
|
--with-jpeg-dir=/usr/include/ \
|
||||||
; \
|
; \
|
||||||
docker-php-ext-configure ldap \
|
docker-php-ext-configure ldap \
|
||||||
--with-libdir=lib/$debMultiarch/ \
|
--with-libdir=lib/$debMultiarch/ \
|
||||||
; \
|
;\
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
pdo_mysql \
|
pdo_mysql \
|
||||||
gd \
|
gd \
|
||||||
|
@ -85,12 +85,12 @@ RUN set -ex; \
|
||||||
apt-mark auto '.*' > /dev/null; \
|
apt-mark auto '.*' > /dev/null; \
|
||||||
apt-mark manual $savedAptMark; \
|
apt-mark manual $savedAptMark; \
|
||||||
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
|
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
|
||||||
| awk '/=>/ { print $3 }' \
|
| awk '/=>/ { print $3 }' \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs -r dpkg-query -S \
|
| xargs -r dpkg-query -S \
|
||||||
| cut -d: -f1 \
|
| cut -d: -f1 \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs -rt apt-mark manual; \
|
| xargs -rt apt-mark manual; \
|
||||||
\
|
\
|
||||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
trap "break;exit" HUP INT TERM
|
trap "break;exit" HUP INT TERM
|
||||||
|
|
||||||
while [ ! -f /var/www/html/bin/daemon.php ]; do
|
while [ ! -f /var/www/html/bin/daemon.php ]; do
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
||||||
|
|
|
@ -3,67 +3,67 @@ set -eu
|
||||||
|
|
||||||
# checks if the branch and repository exists
|
# checks if the branch and repository exists
|
||||||
check_branch() {
|
check_branch() {
|
||||||
repo=${1:-}
|
repo=${1:-}
|
||||||
branch=${2:-}
|
branch=${2:-}
|
||||||
git ls-remote --heads --tags "https://github.com/$repo" | grep -E "refs/(heads|tags)/${branch}$" >/dev/null
|
git ls-remote --heads --tags "https://github.com/$repo" | grep -E "refs/(heads|tags)/${branch}$" >/dev/null
|
||||||
[ "$?" -eq "0" ]
|
[ "$?" -eq "0" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
# clones the whole develop branch (Friendica and Addons)
|
# clones the whole develop branch (Friendica and Addons)
|
||||||
clone_develop() {
|
clone_develop() {
|
||||||
friendica_git="${FRIENDICA_VERSION}"
|
friendica_git="${FRIENDICA_VERSION}"
|
||||||
addons_git="${FRIENDICA_ADDONS}"
|
addons_git="${FRIENDICA_ADDONS}"
|
||||||
friendica_repo="${FRIENDICA_REPOSITORY:-friendica/friendica}"
|
friendica_repo="${FRIENDICA_REPOSITORY:-friendica/friendica}"
|
||||||
friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica/friendica-addons}"
|
friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica/friendica-addons}"
|
||||||
|
|
||||||
if echo "{$friendica_git,,}" | grep -Eq '^.*\-dev'; then
|
if echo "{$friendica_git,,}" | grep -Eq '^.*\-dev'; then
|
||||||
friendica_git="develop"
|
friendica_git="develop"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then
|
if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then
|
||||||
addons_git="develop"
|
addons_git="develop"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check if the branches exist before wiping the
|
# Check if the branches exist before wiping the
|
||||||
if check_branch "$friendica_repo" "$friendica_git" && check_branch "$friendica_addons_repo" "$addons_git" ; then
|
if check_branch "$friendica_repo" "$friendica_git" && check_branch "$friendica_addons_repo" "$addons_git" ; then
|
||||||
echo "Cloning '${friendica_git}' from GitHub repository '${friendica_repo}' ..."
|
echo "Cloning '${friendica_git}' from GitHub repository '${friendica_repo}' ..."
|
||||||
|
|
||||||
# Removing the whole directory first
|
# Removing the whole directory first
|
||||||
rm -fr /usr/src/friendica
|
rm -fr /usr/src/friendica
|
||||||
git clone -q -b ${friendica_git} "https://github.com/${friendica_repo}" /usr/src/friendica
|
git clone -q -b ${friendica_git} "https://github.com/${friendica_repo}" /usr/src/friendica
|
||||||
|
|
||||||
mkdir /usr/src/friendica/addon
|
mkdir /usr/src/friendica/addon
|
||||||
git clone -q -b ${addons_git} "https://github.com/${friendica_addons_repo}" /usr/src/friendica/addon
|
git clone -q -b ${addons_git} "https://github.com/${friendica_addons_repo}" /usr/src/friendica/addon
|
||||||
|
|
||||||
echo "Download finished"
|
echo "Download finished"
|
||||||
|
|
||||||
if [ ! -f /usr/src/friendica/VERSION ]; then
|
if [ ! -f /usr/src/friendica/VERSION ]; then
|
||||||
echo "Couldn't clone repository"
|
echo "Couldn't clone repository"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
/usr/src/friendica/bin/composer.phar install --no-dev -d /usr/src/friendica
|
/usr/src/friendica/bin/composer.phar install --no-dev -d /usr/src/friendica
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
else
|
else
|
||||||
if check_branch "$friendica_repo" "$friendica_git"; then
|
if check_branch "$friendica_repo" "$friendica_git"; then
|
||||||
echo "$friendica_repo/$friendica_git is not valid."
|
echo "$friendica_repo/$friendica_git is not valid."
|
||||||
else
|
else
|
||||||
echo "$friendica_addons_repo/$addons_git is not valid."
|
echo "$friendica_addons_repo/$addons_git is not valid."
|
||||||
fi
|
fi
|
||||||
echo "Using old version."
|
echo "Using old version."
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# just check if we execute apache or php-fpm
|
# just check if we execute apache or php-fpm
|
||||||
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
||||||
# cloning from git is just possible for develop or Release Candidats
|
# cloning from git is just possible for develop or Release Candidate
|
||||||
if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)' || [ "${FRIENDICA_UPGRADE:-false}" = "true" ] || [ ! -f /usr/src/friendica/VERSION ]; then
|
if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)' || [ "${FRIENDICA_UPGRADE:-false}" = "true" ] || [ ! -f /usr/src/friendica/VERSION ]; then
|
||||||
# just clone & check if it's a new install or upgrade
|
# just clone & check if it's a new install or upgrade
|
||||||
clone_develop
|
clone_develop
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec /entrypoint.sh "$@"
|
exec /entrypoint.sh "$@"
|
||||||
|
|
|
@ -3,147 +3,147 @@ set -eu
|
||||||
|
|
||||||
# run an command with the www-data user
|
# run an command with the www-data user
|
||||||
run_as() {
|
run_as() {
|
||||||
set -- -c "cd /var/www/html; $*"
|
set -- -c "cd /var/www/html; $*"
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
su - www-data -s /bin/sh "$@"
|
su - www-data -s /bin/sh "$@"
|
||||||
else
|
else
|
||||||
sh "$@"
|
sh "$@"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# checks if the the first parameter is greater than the second parameter
|
# checks if the the first parameter is greater than the second parameter
|
||||||
version_greater() {
|
version_greater() {
|
||||||
[ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
|
[ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
setup_ssmtp() {
|
setup_ssmtp() {
|
||||||
if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
|
if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
|
||||||
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
|
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
|
||||||
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
|
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
|
||||||
|
|
||||||
smtp_from=${SMTP_FROM:-no-reply}
|
smtp_from=${SMTP_FROM:-no-reply}
|
||||||
|
|
||||||
# Setup SSMTP
|
# Setup SSMTP
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
|
||||||
|
|
||||||
# add possible mail-senders
|
# add possible mail-senders
|
||||||
{
|
{
|
||||||
echo "www-data:$smtp_from@$SMTP_DOMAIN:$SMTP"
|
echo "www-data:$smtp_from@$SMTP_DOMAIN:$SMTP"
|
||||||
echo "root::$smtp_from@$SMTP_DOMAIN:$SMTP"
|
echo "root::$smtp_from@$SMTP_DOMAIN:$SMTP"
|
||||||
} > /etc/ssmtp/revaliases
|
} > /etc/ssmtp/revaliases
|
||||||
|
|
||||||
# replace ssmtp.conf settings
|
# replace ssmtp.conf settings
|
||||||
{
|
{
|
||||||
echo "root=:$smtp_from@$SMTP_DOMAIN"
|
echo "root=:$smtp_from@$SMTP_DOMAIN"
|
||||||
echo "hostname=$SMTP_DOMAIN"
|
echo "hostname=$SMTP_DOMAIN"
|
||||||
echo "mailhub=$SMTP"
|
echo "mailhub=$SMTP"
|
||||||
echo "FromLineOverride=YES"
|
echo "FromLineOverride=YES"
|
||||||
if [ -n "${SMTP_TLS+x}" ]; then echo "UseTLS=$SMTP_TLS"; fi
|
if [ -n "${SMTP_TLS+x}" ]; then echo "UseTLS=$SMTP_TLS"; fi
|
||||||
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "UseSTARTTLS=$SMTP_STARTTLS"; fi
|
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "UseSTARTTLS=$SMTP_STARTTLS"; fi
|
||||||
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "AuthUser=$SMTP_AUTH_USER"; fi
|
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "AuthUser=$SMTP_AUTH_USER"; fi
|
||||||
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "AuthPass=$SMTP_AUTH_PASS";fi
|
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "AuthPass=$SMTP_AUTH_PASS";fi
|
||||||
if [ -n "${SMTP_AUTH_METHOD+x}" ]; then echo "AuthMethod=$SMTP_AUTH_METHOD"; fi
|
if [ -n "${SMTP_AUTH_METHOD+x}" ]; then echo "AuthMethod=$SMTP_AUTH_METHOD"; fi
|
||||||
} > /etc/ssmtp/ssmtp.conf
|
} > /etc/ssmtp/ssmtp.conf
|
||||||
|
|
||||||
echo "Setup finished"
|
echo "Setup finished"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# just check if we execute apache or php-fpm
|
# just check if we execute apache or php-fpm
|
||||||
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
||||||
installed_version="0.0.0.0"
|
installed_version="0.0.0.0"
|
||||||
if [ -f /var/www/html/VERSION ]; then
|
if [ -f /var/www/html/VERSION ]; then
|
||||||
installed_version="$(cat /var/www/html/VERSION)"
|
installed_version="$(cat /var/www/html/VERSION)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
image_version="$(cat /usr/src/friendica/VERSION)"
|
image_version="$(cat /usr/src/friendica/VERSION)"
|
||||||
|
|
||||||
# no downgrading possible
|
# no downgrading possible
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
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)"
|
echo "Can't copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ($image_version)"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
setup_ssmtp
|
setup_ssmtp
|
||||||
|
|
||||||
# check it just in case the version is greater or if we force the upgrade
|
# check it just in case the version is greater or if we force the upgrade
|
||||||
if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
|
if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
|
||||||
echo "Initializing Friendica $image_version ..."
|
echo "Initializing Friendica $image_version ..."
|
||||||
|
|
||||||
if [ "$installed_version" != "0.0.0.0" ]; then
|
if [ "$installed_version" != "0.0.0.0" ]; then
|
||||||
echo "Upgrading Friendica from $installed_version ..."
|
echo "Upgrading Friendica from $installed_version ..."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
rsync_options="-rlDog --chown=www-data:www-data"
|
rsync_options="-rlDog --chown=www-data:www-data"
|
||||||
else
|
else
|
||||||
rsync_options="-rlD"
|
rsync_options="-rlD"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
|
rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
|
||||||
|
|
||||||
# Update docker-based config files, but never delete other config files
|
# Update docker-based config files, but never delete other config files
|
||||||
rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
|
rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
|
||||||
|
|
||||||
# In case there is no .htaccess, copy it from the default dist file
|
# In case there is no .htaccess, copy it from the default dist file
|
||||||
if [ ! -f "/var/www/html/.htaccess" ]; then
|
if [ ! -f "/var/www/html/.htaccess" ]; then
|
||||||
cp "/var/www/html/.htaccess-dist" "/var/www/html/.htaccess"
|
cp "/var/www/html/.htaccess-dist" "/var/www/html/.htaccess"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d /var/www/html/view/smarty3 ]; then
|
if [ -d /var/www/html/view/smarty3 ]; then
|
||||||
chmod -R 777 /var/www/html/view/smarty3
|
chmod -R 777 /var/www/html/view/smarty3
|
||||||
fi
|
fi
|
||||||
echo "Initializing finished"
|
echo "Initializing finished"
|
||||||
|
|
||||||
# install
|
# install
|
||||||
if [ "$installed_version" = "0.0.0.0" ]; then
|
if [ "$installed_version" = "0.0.0.0" ]; then
|
||||||
echo "New Friendica instance"
|
echo "New Friendica instance"
|
||||||
|
|
||||||
install=false
|
install=false
|
||||||
if [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${FRIENDICA_ADMIN_MAIL+x}" ] && [ -n "${FRIENDICA_URL+x}" ]; then
|
if [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${FRIENDICA_ADMIN_MAIL+x}" ] && [ -n "${FRIENDICA_URL+x}" ]; then
|
||||||
echo "Installation with environment variables"
|
echo "Installation with environment variables"
|
||||||
|
|
||||||
FRIENDICA_TZ=${FRIENDICA_TZ:-America/LosAngeles}
|
FRIENDICA_TZ=${FRIENDICA_TZ:-America/LosAngeles}
|
||||||
FRIENDICA_LANG=${FRIENDICA_LANG:-en}
|
FRIENDICA_LANG=${FRIENDICA_LANG:-en}
|
||||||
MYSQL_PORT=${MYSQL_PORT:-3306}
|
MYSQL_PORT=${MYSQL_PORT:-3306}
|
||||||
|
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
install_options='-s --dbhost "'$MYSQL_HOST'" --dbport "'$MYSQL_PORT'" --dbdata "'$MYSQL_DATABASE'" --dbuser "'$MYSQL_USER'" --dbpass "'$MYSQL_PASSWORD'"'
|
install_options='-s --dbhost "'$MYSQL_HOST'" --dbport "'$MYSQL_PORT'" --dbdata "'$MYSQL_DATABASE'" --dbuser "'$MYSQL_USER'" --dbpass "'$MYSQL_PASSWORD'"'
|
||||||
|
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'" --url "'$FRIENDICA_URL'"'
|
install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'" --url "'$FRIENDICA_URL'"'
|
||||||
install=true
|
install=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$install" = true ]; then
|
if [ "$install" = true ]; then
|
||||||
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
||||||
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
|
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
|
||||||
|
|
||||||
echo "Starting Friendica installation ..."
|
echo "Starting Friendica installation ..."
|
||||||
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
|
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
|
||||||
|
|
||||||
rm -fr /var/www/html/view/smarty3/compiled
|
rm -fr /var/www/html/view/smarty3/compiled
|
||||||
|
|
||||||
# load other config files (*.config.php) to the config folder
|
# load other config files (*.config.php) to the config folder
|
||||||
if [ -d "/usr/src/config" ]; then
|
if [ -d "/usr/src/config" ]; then
|
||||||
rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
|
rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Installation finished"
|
echo "Installation finished"
|
||||||
else
|
else
|
||||||
echo "[ERROR] Waited 300 seconds, no response" >&2
|
echo "[ERROR] Waited 300 seconds, no response" >&2
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "Running web-based installer on first connect!"
|
echo "Running web-based installer on first connect!"
|
||||||
fi
|
fi
|
||||||
# upgrade
|
# upgrade
|
||||||
else
|
else
|
||||||
echo "Upgrading Friendica ..."
|
echo "Upgrading Friendica ..."
|
||||||
run_as 'php /var/www/html/bin/console.php dbstructure update'
|
run_as 'php /var/www/html/bin/console.php dbstructure update'
|
||||||
echo "Upgrading finished"
|
echo "Upgrading finished"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
|
@ -42,12 +42,12 @@ RUN set -ex; \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
pdo_mysql \
|
pdo_mysql \
|
||||||
gd \
|
gd \
|
||||||
zip \
|
zip \
|
||||||
opcache \
|
opcache \
|
||||||
pcntl \
|
pcntl \
|
||||||
ldap \
|
ldap \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
# pecl will claim success even if one install fails, so we need to perform each install separately
|
# pecl will claim success even if one install fails, so we need to perform each install separately
|
||||||
|
@ -57,17 +57,17 @@ RUN set -ex; \
|
||||||
pecl install imagick-3.4.4; \
|
pecl install imagick-3.4.4; \
|
||||||
\
|
\
|
||||||
docker-php-ext-enable \
|
docker-php-ext-enable \
|
||||||
apcu \
|
apcu \
|
||||||
memcached \
|
memcached \
|
||||||
redis \
|
redis \
|
||||||
imagick \
|
imagick \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
runDeps="$( \
|
runDeps="$( \
|
||||||
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
|
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
|
||||||
| tr ',' '\n' \
|
| tr ',' '\n' \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| awk 'system("[ -e /usr/local/lib" $1 " ]") == 0 { next } { print "so:" $1 }' \
|
| awk 'system("[ -e /usr/local/lib" $1 " ]") == 0 { next } { print "so:" $1 }' \
|
||||||
)"; \
|
)"; \
|
||||||
apk add --no-network --virtual .friendica-phpext-rundeps $runDeps; \
|
apk add --no-network --virtual .friendica-phpext-rundeps $runDeps; \
|
||||||
apk del --no-network .build-deps;
|
apk del --no-network .build-deps;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
trap "break;exit" HUP INT TERM
|
trap "break;exit" HUP INT TERM
|
||||||
|
|
||||||
while [ ! -f /var/www/html/bin/daemon.php ]; do
|
while [ ! -f /var/www/html/bin/daemon.php ]; do
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
||||||
|
|
|
@ -3,67 +3,67 @@ set -eu
|
||||||
|
|
||||||
# checks if the branch and repository exists
|
# checks if the branch and repository exists
|
||||||
check_branch() {
|
check_branch() {
|
||||||
repo=${1:-}
|
repo=${1:-}
|
||||||
branch=${2:-}
|
branch=${2:-}
|
||||||
git ls-remote --heads --tags "https://github.com/$repo" | grep -E "refs/(heads|tags)/${branch}$" >/dev/null
|
git ls-remote --heads --tags "https://github.com/$repo" | grep -E "refs/(heads|tags)/${branch}$" >/dev/null
|
||||||
[ "$?" -eq "0" ]
|
[ "$?" -eq "0" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
# clones the whole develop branch (Friendica and Addons)
|
# clones the whole develop branch (Friendica and Addons)
|
||||||
clone_develop() {
|
clone_develop() {
|
||||||
friendica_git="${FRIENDICA_VERSION}"
|
friendica_git="${FRIENDICA_VERSION}"
|
||||||
addons_git="${FRIENDICA_ADDONS}"
|
addons_git="${FRIENDICA_ADDONS}"
|
||||||
friendica_repo="${FRIENDICA_REPOSITORY:-friendica/friendica}"
|
friendica_repo="${FRIENDICA_REPOSITORY:-friendica/friendica}"
|
||||||
friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica/friendica-addons}"
|
friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica/friendica-addons}"
|
||||||
|
|
||||||
if echo "{$friendica_git,,}" | grep -Eq '^.*\-dev'; then
|
if echo "{$friendica_git,,}" | grep -Eq '^.*\-dev'; then
|
||||||
friendica_git="develop"
|
friendica_git="develop"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then
|
if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then
|
||||||
addons_git="develop"
|
addons_git="develop"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check if the branches exist before wiping the
|
# Check if the branches exist before wiping the
|
||||||
if check_branch "$friendica_repo" "$friendica_git" && check_branch "$friendica_addons_repo" "$addons_git" ; then
|
if check_branch "$friendica_repo" "$friendica_git" && check_branch "$friendica_addons_repo" "$addons_git" ; then
|
||||||
echo "Cloning '${friendica_git}' from GitHub repository '${friendica_repo}' ..."
|
echo "Cloning '${friendica_git}' from GitHub repository '${friendica_repo}' ..."
|
||||||
|
|
||||||
# Removing the whole directory first
|
# Removing the whole directory first
|
||||||
rm -fr /usr/src/friendica
|
rm -fr /usr/src/friendica
|
||||||
git clone -q -b ${friendica_git} "https://github.com/${friendica_repo}" /usr/src/friendica
|
git clone -q -b ${friendica_git} "https://github.com/${friendica_repo}" /usr/src/friendica
|
||||||
|
|
||||||
mkdir /usr/src/friendica/addon
|
mkdir /usr/src/friendica/addon
|
||||||
git clone -q -b ${addons_git} "https://github.com/${friendica_addons_repo}" /usr/src/friendica/addon
|
git clone -q -b ${addons_git} "https://github.com/${friendica_addons_repo}" /usr/src/friendica/addon
|
||||||
|
|
||||||
echo "Download finished"
|
echo "Download finished"
|
||||||
|
|
||||||
if [ ! -f /usr/src/friendica/VERSION ]; then
|
if [ ! -f /usr/src/friendica/VERSION ]; then
|
||||||
echo "Couldn't clone repository"
|
echo "Couldn't clone repository"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
/usr/src/friendica/bin/composer.phar install --no-dev -d /usr/src/friendica
|
/usr/src/friendica/bin/composer.phar install --no-dev -d /usr/src/friendica
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
else
|
else
|
||||||
if check_branch "$friendica_repo" "$friendica_git"; then
|
if check_branch "$friendica_repo" "$friendica_git"; then
|
||||||
echo "$friendica_repo/$friendica_git is not valid."
|
echo "$friendica_repo/$friendica_git is not valid."
|
||||||
else
|
else
|
||||||
echo "$friendica_addons_repo/$addons_git is not valid."
|
echo "$friendica_addons_repo/$addons_git is not valid."
|
||||||
fi
|
fi
|
||||||
echo "Using old version."
|
echo "Using old version."
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# just check if we execute apache or php-fpm
|
# just check if we execute apache or php-fpm
|
||||||
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
||||||
# cloning from git is just possible for develop or Release Candidats
|
# cloning from git is just possible for develop or Release Candidate
|
||||||
if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)' || [ "${FRIENDICA_UPGRADE:-false}" = "true" ] || [ ! -f /usr/src/friendica/VERSION ]; then
|
if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)' || [ "${FRIENDICA_UPGRADE:-false}" = "true" ] || [ ! -f /usr/src/friendica/VERSION ]; then
|
||||||
# just clone & check if it's a new install or upgrade
|
# just clone & check if it's a new install or upgrade
|
||||||
clone_develop
|
clone_develop
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec /entrypoint.sh "$@"
|
exec /entrypoint.sh "$@"
|
||||||
|
|
|
@ -3,147 +3,147 @@ set -eu
|
||||||
|
|
||||||
# run an command with the www-data user
|
# run an command with the www-data user
|
||||||
run_as() {
|
run_as() {
|
||||||
set -- -c "cd /var/www/html; $*"
|
set -- -c "cd /var/www/html; $*"
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
su - www-data -s /bin/sh "$@"
|
su - www-data -s /bin/sh "$@"
|
||||||
else
|
else
|
||||||
sh "$@"
|
sh "$@"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# checks if the the first parameter is greater than the second parameter
|
# checks if the the first parameter is greater than the second parameter
|
||||||
version_greater() {
|
version_greater() {
|
||||||
[ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
|
[ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
setup_ssmtp() {
|
setup_ssmtp() {
|
||||||
if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
|
if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
|
||||||
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
|
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
|
||||||
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
|
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
|
||||||
|
|
||||||
smtp_from=${SMTP_FROM:-no-reply}
|
smtp_from=${SMTP_FROM:-no-reply}
|
||||||
|
|
||||||
# Setup SSMTP
|
# Setup SSMTP
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
|
||||||
|
|
||||||
# add possible mail-senders
|
# add possible mail-senders
|
||||||
{
|
{
|
||||||
echo "www-data:$smtp_from@$SMTP_DOMAIN:$SMTP"
|
echo "www-data:$smtp_from@$SMTP_DOMAIN:$SMTP"
|
||||||
echo "root::$smtp_from@$SMTP_DOMAIN:$SMTP"
|
echo "root::$smtp_from@$SMTP_DOMAIN:$SMTP"
|
||||||
} > /etc/ssmtp/revaliases
|
} > /etc/ssmtp/revaliases
|
||||||
|
|
||||||
# replace ssmtp.conf settings
|
# replace ssmtp.conf settings
|
||||||
{
|
{
|
||||||
echo "root=:$smtp_from@$SMTP_DOMAIN"
|
echo "root=:$smtp_from@$SMTP_DOMAIN"
|
||||||
echo "hostname=$SMTP_DOMAIN"
|
echo "hostname=$SMTP_DOMAIN"
|
||||||
echo "mailhub=$SMTP"
|
echo "mailhub=$SMTP"
|
||||||
echo "FromLineOverride=YES"
|
echo "FromLineOverride=YES"
|
||||||
if [ -n "${SMTP_TLS+x}" ]; then echo "UseTLS=$SMTP_TLS"; fi
|
if [ -n "${SMTP_TLS+x}" ]; then echo "UseTLS=$SMTP_TLS"; fi
|
||||||
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "UseSTARTTLS=$SMTP_STARTTLS"; fi
|
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "UseSTARTTLS=$SMTP_STARTTLS"; fi
|
||||||
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "AuthUser=$SMTP_AUTH_USER"; fi
|
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "AuthUser=$SMTP_AUTH_USER"; fi
|
||||||
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "AuthPass=$SMTP_AUTH_PASS";fi
|
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "AuthPass=$SMTP_AUTH_PASS";fi
|
||||||
if [ -n "${SMTP_AUTH_METHOD+x}" ]; then echo "AuthMethod=$SMTP_AUTH_METHOD"; fi
|
if [ -n "${SMTP_AUTH_METHOD+x}" ]; then echo "AuthMethod=$SMTP_AUTH_METHOD"; fi
|
||||||
} > /etc/ssmtp/ssmtp.conf
|
} > /etc/ssmtp/ssmtp.conf
|
||||||
|
|
||||||
echo "Setup finished"
|
echo "Setup finished"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# just check if we execute apache or php-fpm
|
# just check if we execute apache or php-fpm
|
||||||
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
||||||
installed_version="0.0.0.0"
|
installed_version="0.0.0.0"
|
||||||
if [ -f /var/www/html/VERSION ]; then
|
if [ -f /var/www/html/VERSION ]; then
|
||||||
installed_version="$(cat /var/www/html/VERSION)"
|
installed_version="$(cat /var/www/html/VERSION)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
image_version="$(cat /usr/src/friendica/VERSION)"
|
image_version="$(cat /usr/src/friendica/VERSION)"
|
||||||
|
|
||||||
# no downgrading possible
|
# no downgrading possible
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
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)"
|
echo "Can't copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ($image_version)"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
setup_ssmtp
|
setup_ssmtp
|
||||||
|
|
||||||
# check it just in case the version is greater or if we force the upgrade
|
# check it just in case the version is greater or if we force the upgrade
|
||||||
if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
|
if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
|
||||||
echo "Initializing Friendica $image_version ..."
|
echo "Initializing Friendica $image_version ..."
|
||||||
|
|
||||||
if [ "$installed_version" != "0.0.0.0" ]; then
|
if [ "$installed_version" != "0.0.0.0" ]; then
|
||||||
echo "Upgrading Friendica from $installed_version ..."
|
echo "Upgrading Friendica from $installed_version ..."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
rsync_options="-rlDog --chown=www-data:www-data"
|
rsync_options="-rlDog --chown=www-data:www-data"
|
||||||
else
|
else
|
||||||
rsync_options="-rlD"
|
rsync_options="-rlD"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
|
rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
|
||||||
|
|
||||||
# Update docker-based config files, but never delete other config files
|
# Update docker-based config files, but never delete other config files
|
||||||
rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
|
rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
|
||||||
|
|
||||||
# In case there is no .htaccess, copy it from the default dist file
|
# In case there is no .htaccess, copy it from the default dist file
|
||||||
if [ ! -f "/var/www/html/.htaccess" ]; then
|
if [ ! -f "/var/www/html/.htaccess" ]; then
|
||||||
cp "/var/www/html/.htaccess-dist" "/var/www/html/.htaccess"
|
cp "/var/www/html/.htaccess-dist" "/var/www/html/.htaccess"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d /var/www/html/view/smarty3 ]; then
|
if [ -d /var/www/html/view/smarty3 ]; then
|
||||||
chmod -R 777 /var/www/html/view/smarty3
|
chmod -R 777 /var/www/html/view/smarty3
|
||||||
fi
|
fi
|
||||||
echo "Initializing finished"
|
echo "Initializing finished"
|
||||||
|
|
||||||
# install
|
# install
|
||||||
if [ "$installed_version" = "0.0.0.0" ]; then
|
if [ "$installed_version" = "0.0.0.0" ]; then
|
||||||
echo "New Friendica instance"
|
echo "New Friendica instance"
|
||||||
|
|
||||||
install=false
|
install=false
|
||||||
if [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${FRIENDICA_ADMIN_MAIL+x}" ] && [ -n "${FRIENDICA_URL+x}" ]; then
|
if [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${FRIENDICA_ADMIN_MAIL+x}" ] && [ -n "${FRIENDICA_URL+x}" ]; then
|
||||||
echo "Installation with environment variables"
|
echo "Installation with environment variables"
|
||||||
|
|
||||||
FRIENDICA_TZ=${FRIENDICA_TZ:-America/LosAngeles}
|
FRIENDICA_TZ=${FRIENDICA_TZ:-America/LosAngeles}
|
||||||
FRIENDICA_LANG=${FRIENDICA_LANG:-en}
|
FRIENDICA_LANG=${FRIENDICA_LANG:-en}
|
||||||
MYSQL_PORT=${MYSQL_PORT:-3306}
|
MYSQL_PORT=${MYSQL_PORT:-3306}
|
||||||
|
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
install_options='-s --dbhost "'$MYSQL_HOST'" --dbport "'$MYSQL_PORT'" --dbdata "'$MYSQL_DATABASE'" --dbuser "'$MYSQL_USER'" --dbpass "'$MYSQL_PASSWORD'"'
|
install_options='-s --dbhost "'$MYSQL_HOST'" --dbport "'$MYSQL_PORT'" --dbdata "'$MYSQL_DATABASE'" --dbuser "'$MYSQL_USER'" --dbpass "'$MYSQL_PASSWORD'"'
|
||||||
|
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'" --url "'$FRIENDICA_URL'"'
|
install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'" --url "'$FRIENDICA_URL'"'
|
||||||
install=true
|
install=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$install" = true ]; then
|
if [ "$install" = true ]; then
|
||||||
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
||||||
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
|
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
|
||||||
|
|
||||||
echo "Starting Friendica installation ..."
|
echo "Starting Friendica installation ..."
|
||||||
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
|
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
|
||||||
|
|
||||||
rm -fr /var/www/html/view/smarty3/compiled
|
rm -fr /var/www/html/view/smarty3/compiled
|
||||||
|
|
||||||
# load other config files (*.config.php) to the config folder
|
# load other config files (*.config.php) to the config folder
|
||||||
if [ -d "/usr/src/config" ]; then
|
if [ -d "/usr/src/config" ]; then
|
||||||
rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
|
rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Installation finished"
|
echo "Installation finished"
|
||||||
else
|
else
|
||||||
echo "[ERROR] Waited 300 seconds, no response" >&2
|
echo "[ERROR] Waited 300 seconds, no response" >&2
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "Running web-based installer on first connect!"
|
echo "Running web-based installer on first connect!"
|
||||||
fi
|
fi
|
||||||
# upgrade
|
# upgrade
|
||||||
else
|
else
|
||||||
echo "Upgrading Friendica ..."
|
echo "Upgrading Friendica ..."
|
||||||
run_as 'php /var/www/html/bin/console.php dbstructure update'
|
run_as 'php /var/www/html/bin/console.php dbstructure update'
|
||||||
echo "Upgrading finished"
|
echo "Upgrading finished"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
|
@ -56,8 +56,8 @@ RUN set -ex; \
|
||||||
--with-jpeg-dir=/usr/include/ \
|
--with-jpeg-dir=/usr/include/ \
|
||||||
; \
|
; \
|
||||||
docker-php-ext-configure ldap \
|
docker-php-ext-configure ldap \
|
||||||
--with-libdir=lib/$debMultiarch/ \
|
--with-libdir=lib/$debMultiarch/ \
|
||||||
; \
|
;\
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
pdo_mysql \
|
pdo_mysql \
|
||||||
gd \
|
gd \
|
||||||
|
@ -85,12 +85,12 @@ RUN set -ex; \
|
||||||
apt-mark auto '.*' > /dev/null; \
|
apt-mark auto '.*' > /dev/null; \
|
||||||
apt-mark manual $savedAptMark; \
|
apt-mark manual $savedAptMark; \
|
||||||
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
|
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
|
||||||
| awk '/=>/ { print $3 }' \
|
| awk '/=>/ { print $3 }' \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs -r dpkg-query -S \
|
| xargs -r dpkg-query -S \
|
||||||
| cut -d: -f1 \
|
| cut -d: -f1 \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs -rt apt-mark manual; \
|
| xargs -rt apt-mark manual; \
|
||||||
\
|
\
|
||||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
trap "break;exit" HUP INT TERM
|
trap "break;exit" HUP INT TERM
|
||||||
|
|
||||||
while [ ! -f /var/www/html/bin/daemon.php ]; do
|
while [ ! -f /var/www/html/bin/daemon.php ]; do
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
||||||
|
|
|
@ -3,67 +3,67 @@ set -eu
|
||||||
|
|
||||||
# checks if the branch and repository exists
|
# checks if the branch and repository exists
|
||||||
check_branch() {
|
check_branch() {
|
||||||
repo=${1:-}
|
repo=${1:-}
|
||||||
branch=${2:-}
|
branch=${2:-}
|
||||||
git ls-remote --heads --tags "https://github.com/$repo" | grep -E "refs/(heads|tags)/${branch}$" >/dev/null
|
git ls-remote --heads --tags "https://github.com/$repo" | grep -E "refs/(heads|tags)/${branch}$" >/dev/null
|
||||||
[ "$?" -eq "0" ]
|
[ "$?" -eq "0" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
# clones the whole develop branch (Friendica and Addons)
|
# clones the whole develop branch (Friendica and Addons)
|
||||||
clone_develop() {
|
clone_develop() {
|
||||||
friendica_git="${FRIENDICA_VERSION}"
|
friendica_git="${FRIENDICA_VERSION}"
|
||||||
addons_git="${FRIENDICA_ADDONS}"
|
addons_git="${FRIENDICA_ADDONS}"
|
||||||
friendica_repo="${FRIENDICA_REPOSITORY:-friendica/friendica}"
|
friendica_repo="${FRIENDICA_REPOSITORY:-friendica/friendica}"
|
||||||
friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica/friendica-addons}"
|
friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica/friendica-addons}"
|
||||||
|
|
||||||
if echo "{$friendica_git,,}" | grep -Eq '^.*\-dev'; then
|
if echo "{$friendica_git,,}" | grep -Eq '^.*\-dev'; then
|
||||||
friendica_git="develop"
|
friendica_git="develop"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then
|
if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then
|
||||||
addons_git="develop"
|
addons_git="develop"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check if the branches exist before wiping the
|
# Check if the branches exist before wiping the
|
||||||
if check_branch "$friendica_repo" "$friendica_git" && check_branch "$friendica_addons_repo" "$addons_git" ; then
|
if check_branch "$friendica_repo" "$friendica_git" && check_branch "$friendica_addons_repo" "$addons_git" ; then
|
||||||
echo "Cloning '${friendica_git}' from GitHub repository '${friendica_repo}' ..."
|
echo "Cloning '${friendica_git}' from GitHub repository '${friendica_repo}' ..."
|
||||||
|
|
||||||
# Removing the whole directory first
|
# Removing the whole directory first
|
||||||
rm -fr /usr/src/friendica
|
rm -fr /usr/src/friendica
|
||||||
git clone -q -b ${friendica_git} "https://github.com/${friendica_repo}" /usr/src/friendica
|
git clone -q -b ${friendica_git} "https://github.com/${friendica_repo}" /usr/src/friendica
|
||||||
|
|
||||||
mkdir /usr/src/friendica/addon
|
mkdir /usr/src/friendica/addon
|
||||||
git clone -q -b ${addons_git} "https://github.com/${friendica_addons_repo}" /usr/src/friendica/addon
|
git clone -q -b ${addons_git} "https://github.com/${friendica_addons_repo}" /usr/src/friendica/addon
|
||||||
|
|
||||||
echo "Download finished"
|
echo "Download finished"
|
||||||
|
|
||||||
if [ ! -f /usr/src/friendica/VERSION ]; then
|
if [ ! -f /usr/src/friendica/VERSION ]; then
|
||||||
echo "Couldn't clone repository"
|
echo "Couldn't clone repository"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
/usr/src/friendica/bin/composer.phar install --no-dev -d /usr/src/friendica
|
/usr/src/friendica/bin/composer.phar install --no-dev -d /usr/src/friendica
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
else
|
else
|
||||||
if check_branch "$friendica_repo" "$friendica_git"; then
|
if check_branch "$friendica_repo" "$friendica_git"; then
|
||||||
echo "$friendica_repo/$friendica_git is not valid."
|
echo "$friendica_repo/$friendica_git is not valid."
|
||||||
else
|
else
|
||||||
echo "$friendica_addons_repo/$addons_git is not valid."
|
echo "$friendica_addons_repo/$addons_git is not valid."
|
||||||
fi
|
fi
|
||||||
echo "Using old version."
|
echo "Using old version."
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# just check if we execute apache or php-fpm
|
# just check if we execute apache or php-fpm
|
||||||
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
||||||
# cloning from git is just possible for develop or Release Candidats
|
# cloning from git is just possible for develop or Release Candidate
|
||||||
if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)' || [ "${FRIENDICA_UPGRADE:-false}" = "true" ] || [ ! -f /usr/src/friendica/VERSION ]; then
|
if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)' || [ "${FRIENDICA_UPGRADE:-false}" = "true" ] || [ ! -f /usr/src/friendica/VERSION ]; then
|
||||||
# just clone & check if it's a new install or upgrade
|
# just clone & check if it's a new install or upgrade
|
||||||
clone_develop
|
clone_develop
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec /entrypoint.sh "$@"
|
exec /entrypoint.sh "$@"
|
||||||
|
|
|
@ -3,147 +3,147 @@ set -eu
|
||||||
|
|
||||||
# run an command with the www-data user
|
# run an command with the www-data user
|
||||||
run_as() {
|
run_as() {
|
||||||
set -- -c "cd /var/www/html; $*"
|
set -- -c "cd /var/www/html; $*"
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
su - www-data -s /bin/sh "$@"
|
su - www-data -s /bin/sh "$@"
|
||||||
else
|
else
|
||||||
sh "$@"
|
sh "$@"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# checks if the the first parameter is greater than the second parameter
|
# checks if the the first parameter is greater than the second parameter
|
||||||
version_greater() {
|
version_greater() {
|
||||||
[ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
|
[ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
setup_ssmtp() {
|
setup_ssmtp() {
|
||||||
if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
|
if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
|
||||||
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
|
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
|
||||||
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
|
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
|
||||||
|
|
||||||
smtp_from=${SMTP_FROM:-no-reply}
|
smtp_from=${SMTP_FROM:-no-reply}
|
||||||
|
|
||||||
# Setup SSMTP
|
# Setup SSMTP
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
|
||||||
|
|
||||||
# add possible mail-senders
|
# add possible mail-senders
|
||||||
{
|
{
|
||||||
echo "www-data:$smtp_from@$SMTP_DOMAIN:$SMTP"
|
echo "www-data:$smtp_from@$SMTP_DOMAIN:$SMTP"
|
||||||
echo "root::$smtp_from@$SMTP_DOMAIN:$SMTP"
|
echo "root::$smtp_from@$SMTP_DOMAIN:$SMTP"
|
||||||
} > /etc/ssmtp/revaliases
|
} > /etc/ssmtp/revaliases
|
||||||
|
|
||||||
# replace ssmtp.conf settings
|
# replace ssmtp.conf settings
|
||||||
{
|
{
|
||||||
echo "root=:$smtp_from@$SMTP_DOMAIN"
|
echo "root=:$smtp_from@$SMTP_DOMAIN"
|
||||||
echo "hostname=$SMTP_DOMAIN"
|
echo "hostname=$SMTP_DOMAIN"
|
||||||
echo "mailhub=$SMTP"
|
echo "mailhub=$SMTP"
|
||||||
echo "FromLineOverride=YES"
|
echo "FromLineOverride=YES"
|
||||||
if [ -n "${SMTP_TLS+x}" ]; then echo "UseTLS=$SMTP_TLS"; fi
|
if [ -n "${SMTP_TLS+x}" ]; then echo "UseTLS=$SMTP_TLS"; fi
|
||||||
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "UseSTARTTLS=$SMTP_STARTTLS"; fi
|
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "UseSTARTTLS=$SMTP_STARTTLS"; fi
|
||||||
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "AuthUser=$SMTP_AUTH_USER"; fi
|
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "AuthUser=$SMTP_AUTH_USER"; fi
|
||||||
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "AuthPass=$SMTP_AUTH_PASS";fi
|
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "AuthPass=$SMTP_AUTH_PASS";fi
|
||||||
if [ -n "${SMTP_AUTH_METHOD+x}" ]; then echo "AuthMethod=$SMTP_AUTH_METHOD"; fi
|
if [ -n "${SMTP_AUTH_METHOD+x}" ]; then echo "AuthMethod=$SMTP_AUTH_METHOD"; fi
|
||||||
} > /etc/ssmtp/ssmtp.conf
|
} > /etc/ssmtp/ssmtp.conf
|
||||||
|
|
||||||
echo "Setup finished"
|
echo "Setup finished"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# just check if we execute apache or php-fpm
|
# just check if we execute apache or php-fpm
|
||||||
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
||||||
installed_version="0.0.0.0"
|
installed_version="0.0.0.0"
|
||||||
if [ -f /var/www/html/VERSION ]; then
|
if [ -f /var/www/html/VERSION ]; then
|
||||||
installed_version="$(cat /var/www/html/VERSION)"
|
installed_version="$(cat /var/www/html/VERSION)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
image_version="$(cat /usr/src/friendica/VERSION)"
|
image_version="$(cat /usr/src/friendica/VERSION)"
|
||||||
|
|
||||||
# no downgrading possible
|
# no downgrading possible
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
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)"
|
echo "Can't copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ($image_version)"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
setup_ssmtp
|
setup_ssmtp
|
||||||
|
|
||||||
# check it just in case the version is greater or if we force the upgrade
|
# check it just in case the version is greater or if we force the upgrade
|
||||||
if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
|
if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
|
||||||
echo "Initializing Friendica $image_version ..."
|
echo "Initializing Friendica $image_version ..."
|
||||||
|
|
||||||
if [ "$installed_version" != "0.0.0.0" ]; then
|
if [ "$installed_version" != "0.0.0.0" ]; then
|
||||||
echo "Upgrading Friendica from $installed_version ..."
|
echo "Upgrading Friendica from $installed_version ..."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
rsync_options="-rlDog --chown=www-data:www-data"
|
rsync_options="-rlDog --chown=www-data:www-data"
|
||||||
else
|
else
|
||||||
rsync_options="-rlD"
|
rsync_options="-rlD"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
|
rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
|
||||||
|
|
||||||
# Update docker-based config files, but never delete other config files
|
# Update docker-based config files, but never delete other config files
|
||||||
rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
|
rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
|
||||||
|
|
||||||
# In case there is no .htaccess, copy it from the default dist file
|
# In case there is no .htaccess, copy it from the default dist file
|
||||||
if [ ! -f "/var/www/html/.htaccess" ]; then
|
if [ ! -f "/var/www/html/.htaccess" ]; then
|
||||||
cp "/var/www/html/.htaccess-dist" "/var/www/html/.htaccess"
|
cp "/var/www/html/.htaccess-dist" "/var/www/html/.htaccess"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d /var/www/html/view/smarty3 ]; then
|
if [ -d /var/www/html/view/smarty3 ]; then
|
||||||
chmod -R 777 /var/www/html/view/smarty3
|
chmod -R 777 /var/www/html/view/smarty3
|
||||||
fi
|
fi
|
||||||
echo "Initializing finished"
|
echo "Initializing finished"
|
||||||
|
|
||||||
# install
|
# install
|
||||||
if [ "$installed_version" = "0.0.0.0" ]; then
|
if [ "$installed_version" = "0.0.0.0" ]; then
|
||||||
echo "New Friendica instance"
|
echo "New Friendica instance"
|
||||||
|
|
||||||
install=false
|
install=false
|
||||||
if [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${FRIENDICA_ADMIN_MAIL+x}" ] && [ -n "${FRIENDICA_URL+x}" ]; then
|
if [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${FRIENDICA_ADMIN_MAIL+x}" ] && [ -n "${FRIENDICA_URL+x}" ]; then
|
||||||
echo "Installation with environment variables"
|
echo "Installation with environment variables"
|
||||||
|
|
||||||
FRIENDICA_TZ=${FRIENDICA_TZ:-America/LosAngeles}
|
FRIENDICA_TZ=${FRIENDICA_TZ:-America/LosAngeles}
|
||||||
FRIENDICA_LANG=${FRIENDICA_LANG:-en}
|
FRIENDICA_LANG=${FRIENDICA_LANG:-en}
|
||||||
MYSQL_PORT=${MYSQL_PORT:-3306}
|
MYSQL_PORT=${MYSQL_PORT:-3306}
|
||||||
|
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
install_options='-s --dbhost "'$MYSQL_HOST'" --dbport "'$MYSQL_PORT'" --dbdata "'$MYSQL_DATABASE'" --dbuser "'$MYSQL_USER'" --dbpass "'$MYSQL_PASSWORD'"'
|
install_options='-s --dbhost "'$MYSQL_HOST'" --dbport "'$MYSQL_PORT'" --dbdata "'$MYSQL_DATABASE'" --dbuser "'$MYSQL_USER'" --dbpass "'$MYSQL_PASSWORD'"'
|
||||||
|
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'" --url "'$FRIENDICA_URL'"'
|
install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'" --url "'$FRIENDICA_URL'"'
|
||||||
install=true
|
install=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$install" = true ]; then
|
if [ "$install" = true ]; then
|
||||||
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
||||||
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
|
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
|
||||||
|
|
||||||
echo "Starting Friendica installation ..."
|
echo "Starting Friendica installation ..."
|
||||||
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
|
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
|
||||||
|
|
||||||
rm -fr /var/www/html/view/smarty3/compiled
|
rm -fr /var/www/html/view/smarty3/compiled
|
||||||
|
|
||||||
# load other config files (*.config.php) to the config folder
|
# load other config files (*.config.php) to the config folder
|
||||||
if [ -d "/usr/src/config" ]; then
|
if [ -d "/usr/src/config" ]; then
|
||||||
rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
|
rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Installation finished"
|
echo "Installation finished"
|
||||||
else
|
else
|
||||||
echo "[ERROR] Waited 300 seconds, no response" >&2
|
echo "[ERROR] Waited 300 seconds, no response" >&2
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "Running web-based installer on first connect!"
|
echo "Running web-based installer on first connect!"
|
||||||
fi
|
fi
|
||||||
# upgrade
|
# upgrade
|
||||||
else
|
else
|
||||||
echo "Upgrading Friendica ..."
|
echo "Upgrading Friendica ..."
|
||||||
run_as 'php /var/www/html/bin/console.php dbstructure update'
|
run_as 'php /var/www/html/bin/console.php dbstructure update'
|
||||||
echo "Upgrading finished"
|
echo "Upgrading finished"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
|
@ -41,12 +41,12 @@ RUN set -ex; \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
pdo_mysql \
|
pdo_mysql \
|
||||||
gd \
|
gd \
|
||||||
zip \
|
zip \
|
||||||
opcache \
|
opcache \
|
||||||
pcntl \
|
pcntl \
|
||||||
ldap \
|
ldap \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
# pecl will claim success even if one install fails, so we need to perform each install separately
|
# pecl will claim success even if one install fails, so we need to perform each install separately
|
||||||
|
@ -56,17 +56,17 @@ RUN set -ex; \
|
||||||
pecl install imagick-%%IMAGICK_VERSION%%; \
|
pecl install imagick-%%IMAGICK_VERSION%%; \
|
||||||
\
|
\
|
||||||
docker-php-ext-enable \
|
docker-php-ext-enable \
|
||||||
apcu \
|
apcu \
|
||||||
memcached \
|
memcached \
|
||||||
redis \
|
redis \
|
||||||
imagick \
|
imagick \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
runDeps="$( \
|
runDeps="$( \
|
||||||
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
|
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
|
||||||
| tr ',' '\n' \
|
| tr ',' '\n' \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| awk 'system("[ -e /usr/local/lib" $1 " ]") == 0 { next } { print "so:" $1 }' \
|
| awk 'system("[ -e /usr/local/lib" $1 " ]") == 0 { next } { print "so:" $1 }' \
|
||||||
)"; \
|
)"; \
|
||||||
apk add --no-network --virtual .friendica-phpext-rundeps $runDeps; \
|
apk add --no-network --virtual .friendica-phpext-rundeps $runDeps; \
|
||||||
apk del --no-network .build-deps;
|
apk del --no-network .build-deps;
|
||||||
|
|
|
@ -55,8 +55,8 @@ RUN set -ex; \
|
||||||
--with-jpeg-dir=/usr/include/ \
|
--with-jpeg-dir=/usr/include/ \
|
||||||
; \
|
; \
|
||||||
docker-php-ext-configure ldap \
|
docker-php-ext-configure ldap \
|
||||||
--with-libdir=lib/$debMultiarch/ \
|
--with-libdir=lib/$debMultiarch/ \
|
||||||
; \
|
;\
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
pdo_mysql \
|
pdo_mysql \
|
||||||
gd \
|
gd \
|
||||||
|
@ -84,12 +84,12 @@ RUN set -ex; \
|
||||||
apt-mark auto '.*' > /dev/null; \
|
apt-mark auto '.*' > /dev/null; \
|
||||||
apt-mark manual $savedAptMark; \
|
apt-mark manual $savedAptMark; \
|
||||||
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
|
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
|
||||||
| awk '/=>/ { print $3 }' \
|
| awk '/=>/ { print $3 }' \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs -r dpkg-query -S \
|
| xargs -r dpkg-query -S \
|
||||||
| cut -d: -f1 \
|
| cut -d: -f1 \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs -rt apt-mark manual; \
|
| xargs -rt apt-mark manual; \
|
||||||
\
|
\
|
||||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
trap "break;exit" HUP INT TERM
|
trap "break;exit" HUP INT TERM
|
||||||
|
|
||||||
while [ ! -f /var/www/html/bin/daemon.php ]; do
|
while [ ! -f /var/www/html/bin/daemon.php ]; do
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
||||||
|
|
|
@ -3,67 +3,67 @@ set -eu
|
||||||
|
|
||||||
# checks if the branch and repository exists
|
# checks if the branch and repository exists
|
||||||
check_branch() {
|
check_branch() {
|
||||||
repo=${1:-}
|
repo=${1:-}
|
||||||
branch=${2:-}
|
branch=${2:-}
|
||||||
git ls-remote --heads --tags "https://github.com/$repo" | grep -E "refs/(heads|tags)/${branch}$" >/dev/null
|
git ls-remote --heads --tags "https://github.com/$repo" | grep -E "refs/(heads|tags)/${branch}$" >/dev/null
|
||||||
[ "$?" -eq "0" ]
|
[ "$?" -eq "0" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
# clones the whole develop branch (Friendica and Addons)
|
# clones the whole develop branch (Friendica and Addons)
|
||||||
clone_develop() {
|
clone_develop() {
|
||||||
friendica_git="${FRIENDICA_VERSION}"
|
friendica_git="${FRIENDICA_VERSION}"
|
||||||
addons_git="${FRIENDICA_ADDONS}"
|
addons_git="${FRIENDICA_ADDONS}"
|
||||||
friendica_repo="${FRIENDICA_REPOSITORY:-friendica/friendica}"
|
friendica_repo="${FRIENDICA_REPOSITORY:-friendica/friendica}"
|
||||||
friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica/friendica-addons}"
|
friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica/friendica-addons}"
|
||||||
|
|
||||||
if echo "{$friendica_git,,}" | grep -Eq '^.*\-dev'; then
|
if echo "{$friendica_git,,}" | grep -Eq '^.*\-dev'; then
|
||||||
friendica_git="develop"
|
friendica_git="develop"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then
|
if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then
|
||||||
addons_git="develop"
|
addons_git="develop"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check if the branches exist before wiping the
|
# Check if the branches exist before wiping the
|
||||||
if check_branch "$friendica_repo" "$friendica_git" && check_branch "$friendica_addons_repo" "$addons_git" ; then
|
if check_branch "$friendica_repo" "$friendica_git" && check_branch "$friendica_addons_repo" "$addons_git" ; then
|
||||||
echo "Cloning '${friendica_git}' from GitHub repository '${friendica_repo}' ..."
|
echo "Cloning '${friendica_git}' from GitHub repository '${friendica_repo}' ..."
|
||||||
|
|
||||||
# Removing the whole directory first
|
# Removing the whole directory first
|
||||||
rm -fr /usr/src/friendica
|
rm -fr /usr/src/friendica
|
||||||
git clone -q -b ${friendica_git} "https://github.com/${friendica_repo}" /usr/src/friendica
|
git clone -q -b ${friendica_git} "https://github.com/${friendica_repo}" /usr/src/friendica
|
||||||
|
|
||||||
mkdir /usr/src/friendica/addon
|
mkdir /usr/src/friendica/addon
|
||||||
git clone -q -b ${addons_git} "https://github.com/${friendica_addons_repo}" /usr/src/friendica/addon
|
git clone -q -b ${addons_git} "https://github.com/${friendica_addons_repo}" /usr/src/friendica/addon
|
||||||
|
|
||||||
echo "Download finished"
|
echo "Download finished"
|
||||||
|
|
||||||
if [ ! -f /usr/src/friendica/VERSION ]; then
|
if [ ! -f /usr/src/friendica/VERSION ]; then
|
||||||
echo "Couldn't clone repository"
|
echo "Couldn't clone repository"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
/usr/src/friendica/bin/composer.phar install --no-dev -d /usr/src/friendica
|
/usr/src/friendica/bin/composer.phar install --no-dev -d /usr/src/friendica
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
else
|
else
|
||||||
if check_branch "$friendica_repo" "$friendica_git"; then
|
if check_branch "$friendica_repo" "$friendica_git"; then
|
||||||
echo "$friendica_repo/$friendica_git is not valid."
|
echo "$friendica_repo/$friendica_git is not valid."
|
||||||
else
|
else
|
||||||
echo "$friendica_addons_repo/$addons_git is not valid."
|
echo "$friendica_addons_repo/$addons_git is not valid."
|
||||||
fi
|
fi
|
||||||
echo "Using old version."
|
echo "Using old version."
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# just check if we execute apache or php-fpm
|
# just check if we execute apache or php-fpm
|
||||||
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
||||||
# cloning from git is just possible for develop or Release Candidats
|
# cloning from git is just possible for develop or Release Candidate
|
||||||
if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)' || [ "${FRIENDICA_UPGRADE:-false}" = "true" ] || [ ! -f /usr/src/friendica/VERSION ]; then
|
if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)' || [ "${FRIENDICA_UPGRADE:-false}" = "true" ] || [ ! -f /usr/src/friendica/VERSION ]; then
|
||||||
# just clone & check if it's a new install or upgrade
|
# just clone & check if it's a new install or upgrade
|
||||||
clone_develop
|
clone_develop
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec /entrypoint.sh "$@"
|
exec /entrypoint.sh "$@"
|
||||||
|
|
|
@ -3,147 +3,147 @@ set -eu
|
||||||
|
|
||||||
# run an command with the www-data user
|
# run an command with the www-data user
|
||||||
run_as() {
|
run_as() {
|
||||||
set -- -c "cd /var/www/html; $*"
|
set -- -c "cd /var/www/html; $*"
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
su - www-data -s /bin/sh "$@"
|
su - www-data -s /bin/sh "$@"
|
||||||
else
|
else
|
||||||
sh "$@"
|
sh "$@"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# checks if the the first parameter is greater than the second parameter
|
# checks if the the first parameter is greater than the second parameter
|
||||||
version_greater() {
|
version_greater() {
|
||||||
[ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
|
[ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
setup_ssmtp() {
|
setup_ssmtp() {
|
||||||
if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
|
if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
|
||||||
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
|
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
|
||||||
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
|
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
|
||||||
|
|
||||||
smtp_from=${SMTP_FROM:-no-reply}
|
smtp_from=${SMTP_FROM:-no-reply}
|
||||||
|
|
||||||
# Setup SSMTP
|
# Setup SSMTP
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
|
||||||
|
|
||||||
# add possible mail-senders
|
# add possible mail-senders
|
||||||
{
|
{
|
||||||
echo "www-data:$smtp_from@$SMTP_DOMAIN:$SMTP"
|
echo "www-data:$smtp_from@$SMTP_DOMAIN:$SMTP"
|
||||||
echo "root::$smtp_from@$SMTP_DOMAIN:$SMTP"
|
echo "root::$smtp_from@$SMTP_DOMAIN:$SMTP"
|
||||||
} > /etc/ssmtp/revaliases
|
} > /etc/ssmtp/revaliases
|
||||||
|
|
||||||
# replace ssmtp.conf settings
|
# replace ssmtp.conf settings
|
||||||
{
|
{
|
||||||
echo "root=:$smtp_from@$SMTP_DOMAIN"
|
echo "root=:$smtp_from@$SMTP_DOMAIN"
|
||||||
echo "hostname=$SMTP_DOMAIN"
|
echo "hostname=$SMTP_DOMAIN"
|
||||||
echo "mailhub=$SMTP"
|
echo "mailhub=$SMTP"
|
||||||
echo "FromLineOverride=YES"
|
echo "FromLineOverride=YES"
|
||||||
if [ -n "${SMTP_TLS+x}" ]; then echo "UseTLS=$SMTP_TLS"; fi
|
if [ -n "${SMTP_TLS+x}" ]; then echo "UseTLS=$SMTP_TLS"; fi
|
||||||
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "UseSTARTTLS=$SMTP_STARTTLS"; fi
|
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "UseSTARTTLS=$SMTP_STARTTLS"; fi
|
||||||
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "AuthUser=$SMTP_AUTH_USER"; fi
|
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "AuthUser=$SMTP_AUTH_USER"; fi
|
||||||
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "AuthPass=$SMTP_AUTH_PASS";fi
|
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "AuthPass=$SMTP_AUTH_PASS";fi
|
||||||
if [ -n "${SMTP_AUTH_METHOD+x}" ]; then echo "AuthMethod=$SMTP_AUTH_METHOD"; fi
|
if [ -n "${SMTP_AUTH_METHOD+x}" ]; then echo "AuthMethod=$SMTP_AUTH_METHOD"; fi
|
||||||
} > /etc/ssmtp/ssmtp.conf
|
} > /etc/ssmtp/ssmtp.conf
|
||||||
|
|
||||||
echo "Setup finished"
|
echo "Setup finished"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# just check if we execute apache or php-fpm
|
# just check if we execute apache or php-fpm
|
||||||
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
||||||
installed_version="0.0.0.0"
|
installed_version="0.0.0.0"
|
||||||
if [ -f /var/www/html/VERSION ]; then
|
if [ -f /var/www/html/VERSION ]; then
|
||||||
installed_version="$(cat /var/www/html/VERSION)"
|
installed_version="$(cat /var/www/html/VERSION)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
image_version="$(cat /usr/src/friendica/VERSION)"
|
image_version="$(cat /usr/src/friendica/VERSION)"
|
||||||
|
|
||||||
# no downgrading possible
|
# no downgrading possible
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
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)"
|
echo "Can't copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ($image_version)"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
setup_ssmtp
|
setup_ssmtp
|
||||||
|
|
||||||
# check it just in case the version is greater or if we force the upgrade
|
# check it just in case the version is greater or if we force the upgrade
|
||||||
if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
|
if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
|
||||||
echo "Initializing Friendica $image_version ..."
|
echo "Initializing Friendica $image_version ..."
|
||||||
|
|
||||||
if [ "$installed_version" != "0.0.0.0" ]; then
|
if [ "$installed_version" != "0.0.0.0" ]; then
|
||||||
echo "Upgrading Friendica from $installed_version ..."
|
echo "Upgrading Friendica from $installed_version ..."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
rsync_options="-rlDog --chown=www-data:www-data"
|
rsync_options="-rlDog --chown=www-data:www-data"
|
||||||
else
|
else
|
||||||
rsync_options="-rlD"
|
rsync_options="-rlD"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
|
rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
|
||||||
|
|
||||||
# Update docker-based config files, but never delete other config files
|
# Update docker-based config files, but never delete other config files
|
||||||
rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
|
rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
|
||||||
|
|
||||||
# In case there is no .htaccess, copy it from the default dist file
|
# In case there is no .htaccess, copy it from the default dist file
|
||||||
if [ ! -f "/var/www/html/.htaccess" ]; then
|
if [ ! -f "/var/www/html/.htaccess" ]; then
|
||||||
cp "/var/www/html/.htaccess-dist" "/var/www/html/.htaccess"
|
cp "/var/www/html/.htaccess-dist" "/var/www/html/.htaccess"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d /var/www/html/view/smarty3 ]; then
|
if [ -d /var/www/html/view/smarty3 ]; then
|
||||||
chmod -R 777 /var/www/html/view/smarty3
|
chmod -R 777 /var/www/html/view/smarty3
|
||||||
fi
|
fi
|
||||||
echo "Initializing finished"
|
echo "Initializing finished"
|
||||||
|
|
||||||
# install
|
# install
|
||||||
if [ "$installed_version" = "0.0.0.0" ]; then
|
if [ "$installed_version" = "0.0.0.0" ]; then
|
||||||
echo "New Friendica instance"
|
echo "New Friendica instance"
|
||||||
|
|
||||||
install=false
|
install=false
|
||||||
if [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${FRIENDICA_ADMIN_MAIL+x}" ] && [ -n "${FRIENDICA_URL+x}" ]; then
|
if [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${FRIENDICA_ADMIN_MAIL+x}" ] && [ -n "${FRIENDICA_URL+x}" ]; then
|
||||||
echo "Installation with environment variables"
|
echo "Installation with environment variables"
|
||||||
|
|
||||||
FRIENDICA_TZ=${FRIENDICA_TZ:-America/LosAngeles}
|
FRIENDICA_TZ=${FRIENDICA_TZ:-America/LosAngeles}
|
||||||
FRIENDICA_LANG=${FRIENDICA_LANG:-en}
|
FRIENDICA_LANG=${FRIENDICA_LANG:-en}
|
||||||
MYSQL_PORT=${MYSQL_PORT:-3306}
|
MYSQL_PORT=${MYSQL_PORT:-3306}
|
||||||
|
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
install_options='-s --dbhost "'$MYSQL_HOST'" --dbport "'$MYSQL_PORT'" --dbdata "'$MYSQL_DATABASE'" --dbuser "'$MYSQL_USER'" --dbpass "'$MYSQL_PASSWORD'"'
|
install_options='-s --dbhost "'$MYSQL_HOST'" --dbport "'$MYSQL_PORT'" --dbdata "'$MYSQL_DATABASE'" --dbuser "'$MYSQL_USER'" --dbpass "'$MYSQL_PASSWORD'"'
|
||||||
|
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'" --url "'$FRIENDICA_URL'"'
|
install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'" --url "'$FRIENDICA_URL'"'
|
||||||
install=true
|
install=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$install" = true ]; then
|
if [ "$install" = true ]; then
|
||||||
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
echo "Waiting for MySQL $MYSQL_HOST initialization..."
|
||||||
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
|
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
|
||||||
|
|
||||||
echo "Starting Friendica installation ..."
|
echo "Starting Friendica installation ..."
|
||||||
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
|
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
|
||||||
|
|
||||||
rm -fr /var/www/html/view/smarty3/compiled
|
rm -fr /var/www/html/view/smarty3/compiled
|
||||||
|
|
||||||
# load other config files (*.config.php) to the config folder
|
# load other config files (*.config.php) to the config folder
|
||||||
if [ -d "/usr/src/config" ]; then
|
if [ -d "/usr/src/config" ]; then
|
||||||
rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
|
rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Installation finished"
|
echo "Installation finished"
|
||||||
else
|
else
|
||||||
echo "[ERROR] Waited 300 seconds, no response" >&2
|
echo "[ERROR] Waited 300 seconds, no response" >&2
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "Running web-based installer on first connect!"
|
echo "Running web-based installer on first connect!"
|
||||||
fi
|
fi
|
||||||
# upgrade
|
# upgrade
|
||||||
else
|
else
|
||||||
echo "Upgrading Friendica ..."
|
echo "Upgrading Friendica ..."
|
||||||
run_as 'php /var/www/html/bin/console.php dbstructure update'
|
run_as 'php /var/www/html/bin/console.php dbstructure update'
|
||||||
echo "Upgrading finished"
|
echo "Upgrading finished"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
|
@ -2,53 +2,53 @@
|
||||||
set -Eeuo pipefail
|
set -Eeuo pipefail
|
||||||
|
|
||||||
declare -A release_channel=(
|
declare -A release_channel=(
|
||||||
[stable]='2020.03'
|
[stable]='2020.03'
|
||||||
[latest]='2020.03'
|
[latest]='2020.03'
|
||||||
)
|
)
|
||||||
|
|
||||||
self="$(basename "$BASH_SOURCE")"
|
self="$(basename "${BASH_SOURCE[0]}")"
|
||||||
cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
|
||||||
|
|
||||||
# Get the most recent commit which modified any of "$@".
|
# Get the most recent commit which modified any of "$@".
|
||||||
fileCommit() {
|
fileCommit() {
|
||||||
commit="$(git log -1 --format='format:%H' HEAD -- "$@")"
|
commit="$(git log -1 --format='format:%H' HEAD -- "$@")"
|
||||||
if [ -z "$commit" ]; then
|
if [ -z "$commit" ]; then
|
||||||
# return some valid sha1 hash to make bashbrew happy
|
# return some valid sha1 hash to make bashbrew happy
|
||||||
echo '0000000000000000000000000000000000000000'
|
echo '0000000000000000000000000000000000000000'
|
||||||
else
|
else
|
||||||
echo "$commit"
|
echo "$commit"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Get the most recent commit which modified "$1/Dockerfile" or any file that
|
# Get the most recent commit which modified "$1/Dockerfile" or any file that
|
||||||
# the Dockerfile copies into the rootfs (with COPY).
|
# the Dockerfile copies into the rootfs (with COPY).
|
||||||
dockerfileCommit() {
|
dockerfileCommit() {
|
||||||
local dir="$1"; shift
|
local dir="$1"; shift
|
||||||
(
|
(
|
||||||
cd "$dir";
|
cd "$dir";
|
||||||
fileCommit Dockerfile \
|
fileCommit Dockerfile \
|
||||||
$(awk '
|
"$(awk '
|
||||||
toupper($1) == "COPY" {
|
toupper($1) == "COPY" {
|
||||||
for (i = 2; i < NF; i++)
|
for (i = 2; i < NF; i++)
|
||||||
print $i;
|
print $i;
|
||||||
}
|
}
|
||||||
' Dockerfile)
|
' Dockerfile)"
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
getArches() {
|
getArches() {
|
||||||
local repo="$1"; shift
|
local repo="$1"; shift
|
||||||
local officialImagesUrl='https://github.com/docker-library/official-images/raw/master/library/'
|
local officialImagesUrl='https://github.com/docker-library/official-images/raw/master/library/'
|
||||||
|
|
||||||
eval "declare -g -A parentRepoToArches=( $(
|
eval "declare -g -A parentRepoToArches=( $(
|
||||||
find -maxdepth 3 -name 'Dockerfile' -exec awk '
|
find -maxdepth 3 -name 'Dockerfile' -exec awk '
|
||||||
toupper($1) == "FROM" && $2 !~ /^('"$repo"'|scratch|microsoft\/[^:]+)(:|$)/ {
|
toupper($1) == "FROM" && $2 !~ /^('"$repo"'|scratch|microsoft\/[^:]+)(:|$)/ {
|
||||||
print "'"$officialImagesUrl"'" $2
|
print "'"$officialImagesUrl"'" $2
|
||||||
}
|
}
|
||||||
' '{}' + \
|
' '{}' + \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs bashbrew cat --format '[{{ .RepoName }}:{{ .TagName }}]="{{ join " " .TagEntry.Architectures }}"'
|
| xargs bashbrew cat --format '[{{ .RepoName }}:{{ .TagName }}]="{{ join " " .TagEntry.Architectures }}"'
|
||||||
) )"
|
) )"
|
||||||
}
|
}
|
||||||
getArches 'friendica'
|
getArches 'friendica'
|
||||||
|
|
||||||
|
@ -62,55 +62,56 @@ EOH
|
||||||
|
|
||||||
# prints "$2$1$3$1...$N"
|
# prints "$2$1$3$1...$N"
|
||||||
join() {
|
join() {
|
||||||
local sep="$1"; shift
|
local sep="$1"; shift
|
||||||
local out; printf -v out "${sep//%/%%}%s" "$@"
|
local out; printf -v out "${sep//%/%%}%s" "$@"
|
||||||
echo "${out#$sep}"
|
echo "${out#$sep}"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Generate each of the tags.
|
# Generate each of the tags.
|
||||||
versions=( */ )
|
versions=( */ )
|
||||||
versions=( "${versions[@]%/}" )
|
versions=( "${versions[@]%/}" )
|
||||||
for version in "${versions[@]}"; do
|
for version in "${versions[@]}"; do
|
||||||
variants=( $version/*/ )
|
variants=( $version/*/ )
|
||||||
variants=( $(for variant in "${variants[@]%/}"; do
|
variants=( $(for variant in "${variants[@]%/}"; do
|
||||||
echo "$(basename "$variant")"
|
basename "$variant"
|
||||||
done) )
|
done) )
|
||||||
for variant in "${variants[@]}"; do
|
for variant in "${variants[@]}"; do
|
||||||
commit="$(dockerfileCommit "$version/$variant")"
|
commit="$(dockerfileCommit "$version/$variant")"
|
||||||
|
|
||||||
versionAliases=( )
|
versionAliases=( )
|
||||||
versionPostfix=""
|
versionPostfix=""
|
||||||
|
|
||||||
versionAliases+=( "$version$versionPostfix" )
|
versionAliases+=( "$version$versionPostfix" )
|
||||||
if [ "$version" == *-rc ]; then
|
if [[ "$version" == *-rc ]]; then
|
||||||
versionAliases+=( "rc" )
|
versionAliases+=( "rc" )
|
||||||
fi
|
fi
|
||||||
if [ "$version" == *-dev ]; then
|
if [[ "$version" == *-dev ]]; then
|
||||||
versionAliases+=( "dev" )
|
versionAliases+=( "dev" )
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for channel in "${!release_channel[@]}"; do
|
for channel in "${!release_channel[@]}"; do
|
||||||
if [ "$version" = "${release_channel[$channel]}" ]; then
|
if [ "$version" = "${release_channel[$channel]}" ]; then
|
||||||
versionAliases+=( "$channel" )
|
versionAliases+=( "$channel" )
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
variantAliases=( "${versionAliases[@]/%/-$variant}" )
|
variantAliases=( "${versionAliases[@]/%/-$variant}" )
|
||||||
variantAliases=( "${variantAliases[@]//latest-}" )
|
variantAliases=( "${variantAliases[@]//latest-}" )
|
||||||
|
|
||||||
if [ "$variant" = "apache" ]; then
|
if [ "$variant" = "apache" ]; then
|
||||||
variantAliases+=( "${versionAliases[@]}" )
|
variantAliases+=( "${versionAliases[@]}" )
|
||||||
fi
|
fi
|
||||||
|
|
||||||
variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/$variant/Dockerfile")"
|
variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/$variant/Dockerfile")"
|
||||||
variantArches="${parentRepoToArches[$variantParent]}"
|
# shellcheck disable=SC2154
|
||||||
|
variantArches="${parentRepoToArches[$variantParent]}"
|
||||||
|
|
||||||
cat <<-EOE
|
cat << EOE
|
||||||
|
|
||||||
Tags: $(join ', ' "${variantAliases[@]}")
|
Tags: $(join ', ' "${variantAliases[@]}")
|
||||||
Architectures: $(join ', ' $variantArches)
|
Architectures: $(join ', ' "$variantArches")
|
||||||
GitCommit: $commit
|
GitCommit: $commit
|
||||||
Directory: $version/$variant
|
Directory: $version/$variant
|
||||||
EOE
|
EOE
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
195
update.sh
195
update.sh
|
@ -2,25 +2,25 @@
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
|
|
||||||
declare -A php_version=(
|
declare -A php_version=(
|
||||||
[default]='7.3'
|
[default]='7.3'
|
||||||
)
|
)
|
||||||
|
|
||||||
declare -A cmd=(
|
declare -A cmd=(
|
||||||
[apache]='apache2-foreground'
|
[apache]='apache2-foreground'
|
||||||
[fpm]='php-fpm'
|
[fpm]='php-fpm'
|
||||||
[fpm-alpine]='php-fpm'
|
[fpm-alpine]='php-fpm'
|
||||||
)
|
)
|
||||||
|
|
||||||
declare -A base=(
|
declare -A base=(
|
||||||
[apache]='debian'
|
[apache]='debian'
|
||||||
[fpm]='debian'
|
[fpm]='debian'
|
||||||
[fpm-alpine]='alpine'
|
[fpm-alpine]='alpine'
|
||||||
)
|
)
|
||||||
|
|
||||||
declare -A extras=(
|
declare -A extras=(
|
||||||
[apache]='\nRUN set -ex;\\\n a2enmod rewrite remoteip ;\\\n {\\\n echo RemoteIPHeader X-Real-IP ;\\\n echo RemoteIPTrustedProxy 10.0.0.0/8 ;\\\n echo RemoteIPTrustedProxy 172.16.0.0/12 ;\\\n echo RemoteIPTrustedProxy 192.168.0.0/16 ;\\\n } > /etc/apache2/conf-available/remoteip.conf;\\\n a2enconf remoteip'
|
[apache]='\nRUN set -ex;\\\n a2enmod rewrite remoteip ;\\\n {\\\n echo RemoteIPHeader X-Real-IP ;\\\n echo RemoteIPTrustedProxy 10.0.0.0/8 ;\\\n echo RemoteIPTrustedProxy 172.16.0.0/12 ;\\\n echo RemoteIPTrustedProxy 192.168.0.0/16 ;\\\n } > /etc/apache2/conf-available/remoteip.conf;\\\n a2enconf remoteip'
|
||||||
[fpm]=''
|
[fpm]=''
|
||||||
[fpm-alpine]=''
|
[fpm-alpine]=''
|
||||||
)
|
)
|
||||||
|
|
||||||
declare -A entrypoints=(
|
declare -A entrypoints=(
|
||||||
|
@ -30,143 +30,142 @@ declare -A entrypoints=(
|
||||||
|
|
||||||
# Only for debian variant
|
# Only for debian variant
|
||||||
tini_version="$(
|
tini_version="$(
|
||||||
git ls-remote --tags https://github.com/krallin/tini.git \
|
git ls-remote --tags https://github.com/krallin/tini.git \
|
||||||
| cut -d/ -f3 \
|
| cut -d/ -f3 \
|
||||||
| grep -vE -- '.pre' \
|
| grep -vE -- '.pre' \
|
||||||
| sed -E 's/^v//' \
|
| sed -E 's/^v//' \
|
||||||
| sort -V \
|
| sort -V \
|
||||||
| tail -1
|
| tail -1
|
||||||
)"
|
)"
|
||||||
|
|
||||||
apcu_version="$(
|
apcu_version="$(
|
||||||
git ls-remote --tags https://github.com/krakjoe/apcu.git \
|
git ls-remote --tags https://github.com/krakjoe/apcu.git \
|
||||||
| cut -d/ -f3 \
|
| cut -d/ -f3 \
|
||||||
| grep -vE -- '-rc|-b' \
|
| grep -vE -- '-rc|-b' \
|
||||||
| sed -E 's/^v//' \
|
| sed -E 's/^v//' \
|
||||||
| sort -V \
|
| sort -V \
|
||||||
| tail -1
|
| tail -1
|
||||||
)"
|
)"
|
||||||
|
|
||||||
memcached_version="$(
|
memcached_version="$(
|
||||||
git ls-remote --tags https://github.com/php-memcached-dev/php-memcached.git \
|
git ls-remote --tags https://github.com/php-memcached-dev/php-memcached.git \
|
||||||
| cut -d/ -f3 \
|
| cut -d/ -f3 \
|
||||||
| grep -vE -- '-rc|-b' \
|
| grep -vE -- '-rc|-b' \
|
||||||
| sed -E 's/^[rv]//' \
|
| sed -E 's/^[rv]//' \
|
||||||
| sort -V \
|
| sort -V \
|
||||||
| tail -1
|
| tail -1
|
||||||
)"
|
)"
|
||||||
|
|
||||||
redis_version="$(
|
redis_version="$(
|
||||||
git ls-remote --tags https://github.com/phpredis/phpredis.git \
|
git ls-remote --tags https://github.com/phpredis/phpredis.git \
|
||||||
| cut -d/ -f3 \
|
| cut -d/ -f3 \
|
||||||
| grep -viE '[a-z]' \
|
| grep -viE '[a-z]' \
|
||||||
| tr -d '^{}' \
|
| tr -d '^{}' \
|
||||||
| sort -V \
|
| sort -V \
|
||||||
| tail -1
|
| tail -1
|
||||||
)"
|
)"
|
||||||
|
|
||||||
imagick_version="$(
|
imagick_version="$(
|
||||||
git ls-remote --tags https://github.com/mkoppanen/imagick.git \
|
git ls-remote --tags https://github.com/mkoppanen/imagick.git \
|
||||||
| cut -d/ -f3 \
|
| cut -d/ -f3 \
|
||||||
| grep -viE '[a-z]' \
|
| grep -viE '[a-z]' \
|
||||||
| tr -d '^{}' \
|
| tr -d '^{}' \
|
||||||
| sort -V \
|
| sort -V \
|
||||||
| tail -1
|
| tail -1
|
||||||
)"
|
)"
|
||||||
|
|
||||||
declare -A pecl_versions=(
|
declare -A pecl_versions=(
|
||||||
[APCu]="$apcu_version"
|
[APCu]="$apcu_version"
|
||||||
[memcached]="$memcached_version"
|
[memcached]="$memcached_version"
|
||||||
[redis]="$redis_version"
|
[redis]="$redis_version"
|
||||||
[imagick]="$imagick_version"
|
[imagick]="$imagick_version"
|
||||||
)
|
)
|
||||||
|
|
||||||
declare -A install_extras=(
|
declare -A install_extras=(
|
||||||
['stable']='\nRUN set -ex; \\\n curl -fsSL -o friendica.tar.gz \\\n "https://friendi.ca/wp-content/uploads/${FRIENDICA_VERSION_YEAR}/${FRIENDICA_VERSION_MONTH}/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \\\n tar -xzf friendica.tar.gz -C /usr/src/; \\\n rm friendica.tar.gz; \\\n mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica; \\\n chmod 777 /usr/src/friendica/view/smarty3; \\\n curl -fsSL -o friendica_addons.tar.gz \\\n "https://github.com/friendica/friendica-addons/archive/${FRIENDICA_ADDONS}.tar.gz"; \\\n mkdir -p /usr/src/friendica/proxy; \\\n mkdir -p /usr/src/friendica/addon; \\\n tar -xzf friendica_addons.tar.gz -C /usr/src/friendica/addon --strip-components=1; \\\n rm friendica_addons.tar.gz;'
|
['stable']='\nRUN set -ex; \\\n curl -fsSL -o friendica.tar.gz \\\n "https://friendi.ca/wp-content/uploads/${FRIENDICA_VERSION_YEAR}/${FRIENDICA_VERSION_MONTH}/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \\\n tar -xzf friendica.tar.gz -C /usr/src/; \\\n rm friendica.tar.gz; \\\n mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica; \\\n chmod 777 /usr/src/friendica/view/smarty3; \\\n curl -fsSL -o friendica_addons.tar.gz \\\n "https://github.com/friendica/friendica-addons/archive/${FRIENDICA_ADDONS}.tar.gz"; \\\n mkdir -p /usr/src/friendica/proxy; \\\n mkdir -p /usr/src/friendica/addon; \\\n tar -xzf friendica_addons.tar.gz -C /usr/src/friendica/addon --strip-components=1; \\\n rm friendica_addons.tar.gz;'
|
||||||
['develop']=''
|
['develop']=''
|
||||||
)
|
)
|
||||||
|
|
||||||
variants=(
|
variants=(
|
||||||
apache
|
apache
|
||||||
fpm
|
fpm
|
||||||
fpm-alpine
|
fpm-alpine
|
||||||
)
|
)
|
||||||
|
|
||||||
versions=(
|
versions=(
|
||||||
2020.03
|
2020.03
|
||||||
2020.06-dev
|
2020.06-dev
|
||||||
2020.06-rc
|
2020.06-rc
|
||||||
)
|
)
|
||||||
|
|
||||||
travisEnv=
|
travisEnv=
|
||||||
travisEnvAmd64=
|
travisEnvAmd64=
|
||||||
|
|
||||||
function create_variant() {
|
function create_variant() {
|
||||||
dockerName=${1,,}
|
dockerName=${1,,}
|
||||||
dir="$dockerName/$variant"
|
dir="$dockerName/$variant"
|
||||||
|
|
||||||
# Create the version+variant directory with a Dockerfile.
|
# Create the version+variant directory with a Dockerfile.
|
||||||
mkdir -p "$dir"
|
mkdir -p "$dir"
|
||||||
|
|
||||||
template="Dockerfile-${base[$variant]}.template"
|
template="Dockerfile-${base[$variant]}.template"
|
||||||
echo "# DO NOT EDIT: created by update.sh from $template" > "$dir/Dockerfile"
|
echo "# DO NOT EDIT: created by update.sh from $template" > "$dir/Dockerfile"
|
||||||
cat "$template" >> "$dir/Dockerfile"
|
cat "$template" >> "$dir/Dockerfile"
|
||||||
|
|
||||||
# Check which installation typ we need. If develop, the source will get downloaded by git.
|
# Check which installation typ we need. If develop, the source will get downloaded by git.
|
||||||
install_type='stable'
|
install_type='stable'
|
||||||
if [[ "${1,,}" == *-dev ]] || [[ "${1,,}" == *-rc ]]; then
|
if [[ "${1,,}" == *-dev ]] || [[ "${1,,}" == *-rc ]]; then
|
||||||
install_type='develop'
|
install_type='develop'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Get Year / Month of the Version string
|
# Get Year / Month of the Version string
|
||||||
VERSION_PARTS=(${1//./ })
|
VERSION_PARTS=(${1//./ })
|
||||||
|
|
||||||
echo "updating $1 [$install_type] $variant"
|
echo "updating $1 [$install_type] $variant"
|
||||||
|
|
||||||
# Replace the variables.
|
# Replace the variables.
|
||||||
sed -ri -e '
|
sed -ri -e '
|
||||||
s/%%PHP_VERSION%%/'"${php_version[$version]-${php_version[default]}}"'/g;
|
s/%%PHP_VERSION%%/'"${php_version[$version]-${php_version[default]}}"'/g;
|
||||||
s/%%VARIANT%%/'"$variant"'/g;
|
s/%%VARIANT%%/'"$variant"'/g;
|
||||||
s/%%VERSION%%/'"$1"'/g;
|
s/%%VERSION%%/'"$1"'/g;
|
||||||
s/%%VERSION_YEAR%%/'"${VERSION_PARTS[0]}"'/g;
|
s/%%VERSION_YEAR%%/'"${VERSION_PARTS[0]}"'/g;
|
||||||
s/%%VERSION_MONTH%%/'"${VERSION_PARTS[1]}"'/g;
|
s/%%VERSION_MONTH%%/'"${VERSION_PARTS[1]}"'/g;
|
||||||
s/%%CMD%%/'"${cmd[$variant]}"'/g;
|
s/%%CMD%%/'"${cmd[$variant]}"'/g;
|
||||||
s|%%VARIANT_EXTRAS%%|'"${extras[$variant]}"'|g;
|
s|%%VARIANT_EXTRAS%%|'"${extras[$variant]}"'|g;
|
||||||
s|%%INSTALL_EXTRAS%%|'"${install_extras[$install_type]}"'|g;
|
s|%%INSTALL_EXTRAS%%|'"${install_extras[$install_type]}"'|g;
|
||||||
s/%%APCU_VERSION%%/'"${pecl_versions[APCu]}"'/g;
|
s/%%APCU_VERSION%%/'"${pecl_versions[APCu]}"'/g;
|
||||||
s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g;
|
s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g;
|
||||||
s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/g;
|
s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/g;
|
||||||
s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g;
|
s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g;
|
||||||
s/%%ENTRYPOINT%%/'"${entrypoints[$install_type]}"'/g;
|
s/%%ENTRYPOINT%%/'"${entrypoints[$install_type]}"'/g;
|
||||||
s/%%TINI_VERSION%%/'"${tini_version}"'/g;
|
s/%%TINI_VERSION%%/'"${tini_version}"'/g;
|
||||||
' "$dir/Dockerfile"
|
' "$dir/Dockerfile"
|
||||||
|
|
||||||
for name in entrypoint cron; do
|
for name in entrypoint cron; do
|
||||||
cp "docker-$name.sh" "$dir/$name.sh"
|
cp "docker-$name.sh" "$dir/$name.sh"
|
||||||
done
|
done
|
||||||
|
|
||||||
if [[ $install_type == "develop" ]]; then
|
if [[ $install_type == "develop" ]]; then
|
||||||
cp "docker-entrypoint-dev.sh" "$dir/entrypoint-dev.sh"
|
cp "docker-entrypoint-dev.sh" "$dir/entrypoint-dev.sh"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cp upgrade.exclude "$dir/"
|
cp upgrade.exclude "$dir/"
|
||||||
|
|
||||||
cp -rT .config "$dir/config"
|
cp -rT .config "$dir/config"
|
||||||
|
|
||||||
travisEnvAmd64='\n - env: VERSION='"$dockerName"' VARIANT='"$variant"' ARCH=amd64'"$travisEnvAmd64"
|
travisEnvAmd64='\n - env: VERSION='"$dockerName"' VARIANT='"$variant"' ARCH=amd64'"$travisEnvAmd64"
|
||||||
for arch in i386 amd64; do
|
for arch in i386 amd64; do
|
||||||
travisEnv='\n - env: VERSION='"$dockerName"' VARIANT='"$variant"' ARCH='"$arch$travisEnv"
|
travisEnv='\n - env: VERSION='"$dockerName"' VARIANT='"$variant"' ARCH='"$arch$travisEnv"
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
find . -maxdepth 1 -type d -regextype sed -regex '\./[[:digit:]]\+\(\.\|\-\)[[:digit:]]\+\(-rc\|-dev\)\?' -exec rm -r '{}' \;
|
find . -maxdepth 1 -type d -regextype sed -regex '\./[[:digit:]]\+\(\.\|\-\)[[:digit:]]\+\(-rc\|-dev\)\?' -exec rm -r '{}' \;
|
||||||
|
|
||||||
for version in "${versions[@]}"; do
|
for version in "${versions[@]}"; do
|
||||||
|
for variant in "${variants[@]}"; do
|
||||||
|
|
||||||
for variant in "${variants[@]}"; do
|
create_variant "$version"
|
||||||
|
done
|
||||||
create_variant "$version"
|
|
||||||
done
|
|
||||||
done
|
done
|
||||||
|
|
||||||
# replace the fist '-' with ' '
|
# replace the fist '-' with ' '
|
||||||
|
|
Loading…
Reference in New Issue