From aea96cb91cbbaa2d1a0d146ac75be55b6d6e4414 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Thu, 24 May 2018 22:38:25 +0200 Subject: [PATCH] Bugfixings - `.bin/friendica` - update didn't execute composer - `.bin/friendica` - rsync deleted the `.htconfig.php` - `.bin/friendica` - wrong "addon" version variable --- .bin/friendica | 6 +++--- 2018.05-rc/apache/Dockerfile | 2 +- 2018.05-rc/apache/bin/friendica | 6 +++--- 2018.05-rc/fpm-alpine/Dockerfile | 2 +- 2018.05-rc/fpm-alpine/bin/friendica | 6 +++--- 2018.05-rc/fpm/Dockerfile | 2 +- 2018.05-rc/fpm/bin/friendica | 6 +++--- Dockerfile-alpine.template | 2 +- Dockerfile-debian.template | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.bin/friendica b/.bin/friendica index 0dd718c..07364eb 100644 --- a/.bin/friendica +++ b/.bin/friendica @@ -142,7 +142,7 @@ copy_sources() { fi log 'Copying Friendica sources ('$image_version') from '\'$SOURCEDIR'/friendica'\'' to '\'$WORKDIR\' - rsync $rsync_options --delete --exclude=.git --exclude=photo --exclude=proxy $SOURCEDIR/friendica/ $WORKDIR/ + rsync $rsync_options --delete --exclude=.git --exclude=photo --exclude=proxy --exclude=.htconfig.php $SOURCEDIR/friendica/ $WORKDIR/ if [ -f $WORKDIR/view/smarty3 ]; then chmod 777 $WORKDIR/view/smarty3 @@ -161,7 +161,7 @@ install() { copy_sources log 'Installing Friendica' - if [ "$FRIENDICA_VERSION" = "develop" ]; then + if echo "$FRIENDICA_VERSION" | grep -Eq '^.*(\-dev|-rc)'; then composer "install" fi @@ -187,7 +187,7 @@ update() { copy_sources log 'Upgrading Friendica' - if [ "$FRIENDICA_VERSION" = "develop" ]; then + if echo "$FRIENDICA_VERSION" | grep -Eq '^.*(\-dev|-rc)'; then composer "install" fi console "dbstructure update" diff --git a/2018.05-rc/apache/Dockerfile b/2018.05-rc/apache/Dockerfile index a3bb6ee..fe550c7 100644 --- a/2018.05-rc/apache/Dockerfile +++ b/2018.05-rc/apache/Dockerfile @@ -95,7 +95,7 @@ RUN {\ ENV AUTOINSTALL false ENV FRIENDICA_VERSION 2018.05-rc -ENV ADDONS_VERSION 2018.05-rc +ENV FRIENDICA_ADDONS 2018.05-rc COPY bin/* /usr/local/bin/ diff --git a/2018.05-rc/apache/bin/friendica b/2018.05-rc/apache/bin/friendica index 0dd718c..07364eb 100644 --- a/2018.05-rc/apache/bin/friendica +++ b/2018.05-rc/apache/bin/friendica @@ -142,7 +142,7 @@ copy_sources() { fi log 'Copying Friendica sources ('$image_version') from '\'$SOURCEDIR'/friendica'\'' to '\'$WORKDIR\' - rsync $rsync_options --delete --exclude=.git --exclude=photo --exclude=proxy $SOURCEDIR/friendica/ $WORKDIR/ + rsync $rsync_options --delete --exclude=.git --exclude=photo --exclude=proxy --exclude=.htconfig.php $SOURCEDIR/friendica/ $WORKDIR/ if [ -f $WORKDIR/view/smarty3 ]; then chmod 777 $WORKDIR/view/smarty3 @@ -161,7 +161,7 @@ install() { copy_sources log 'Installing Friendica' - if [ "$FRIENDICA_VERSION" = "develop" ]; then + if echo "$FRIENDICA_VERSION" | grep -Eq '^.*(\-dev|-rc)'; then composer "install" fi @@ -187,7 +187,7 @@ update() { copy_sources log 'Upgrading Friendica' - if [ "$FRIENDICA_VERSION" = "develop" ]; then + if echo "$FRIENDICA_VERSION" | grep -Eq '^.*(\-dev|-rc)'; then composer "install" fi console "dbstructure update" diff --git a/2018.05-rc/fpm-alpine/Dockerfile b/2018.05-rc/fpm-alpine/Dockerfile index c474a8f..de6e474 100644 --- a/2018.05-rc/fpm-alpine/Dockerfile +++ b/2018.05-rc/fpm-alpine/Dockerfile @@ -76,7 +76,7 @@ RUN {\ ENV AUTOINSTALL false ENV FRIENDICA_VERSION 2018.05-rc -ENV ADDONS_VERSION 2018.05-rc +ENV FRIENDICA_ADDONS 2018.05-rc COPY bin/* /usr/local/bin/ diff --git a/2018.05-rc/fpm-alpine/bin/friendica b/2018.05-rc/fpm-alpine/bin/friendica index 0dd718c..07364eb 100644 --- a/2018.05-rc/fpm-alpine/bin/friendica +++ b/2018.05-rc/fpm-alpine/bin/friendica @@ -142,7 +142,7 @@ copy_sources() { fi log 'Copying Friendica sources ('$image_version') from '\'$SOURCEDIR'/friendica'\'' to '\'$WORKDIR\' - rsync $rsync_options --delete --exclude=.git --exclude=photo --exclude=proxy $SOURCEDIR/friendica/ $WORKDIR/ + rsync $rsync_options --delete --exclude=.git --exclude=photo --exclude=proxy --exclude=.htconfig.php $SOURCEDIR/friendica/ $WORKDIR/ if [ -f $WORKDIR/view/smarty3 ]; then chmod 777 $WORKDIR/view/smarty3 @@ -161,7 +161,7 @@ install() { copy_sources log 'Installing Friendica' - if [ "$FRIENDICA_VERSION" = "develop" ]; then + if echo "$FRIENDICA_VERSION" | grep -Eq '^.*(\-dev|-rc)'; then composer "install" fi @@ -187,7 +187,7 @@ update() { copy_sources log 'Upgrading Friendica' - if [ "$FRIENDICA_VERSION" = "develop" ]; then + if echo "$FRIENDICA_VERSION" | grep -Eq '^.*(\-dev|-rc)'; then composer "install" fi console "dbstructure update" diff --git a/2018.05-rc/fpm/Dockerfile b/2018.05-rc/fpm/Dockerfile index 69b38d2..8e220f7 100644 --- a/2018.05-rc/fpm/Dockerfile +++ b/2018.05-rc/fpm/Dockerfile @@ -87,7 +87,7 @@ RUN {\ ENV AUTOINSTALL false ENV FRIENDICA_VERSION 2018.05-rc -ENV ADDONS_VERSION 2018.05-rc +ENV FRIENDICA_ADDONS 2018.05-rc COPY bin/* /usr/local/bin/ diff --git a/2018.05-rc/fpm/bin/friendica b/2018.05-rc/fpm/bin/friendica index 0dd718c..07364eb 100644 --- a/2018.05-rc/fpm/bin/friendica +++ b/2018.05-rc/fpm/bin/friendica @@ -142,7 +142,7 @@ copy_sources() { fi log 'Copying Friendica sources ('$image_version') from '\'$SOURCEDIR'/friendica'\'' to '\'$WORKDIR\' - rsync $rsync_options --delete --exclude=.git --exclude=photo --exclude=proxy $SOURCEDIR/friendica/ $WORKDIR/ + rsync $rsync_options --delete --exclude=.git --exclude=photo --exclude=proxy --exclude=.htconfig.php $SOURCEDIR/friendica/ $WORKDIR/ if [ -f $WORKDIR/view/smarty3 ]; then chmod 777 $WORKDIR/view/smarty3 @@ -161,7 +161,7 @@ install() { copy_sources log 'Installing Friendica' - if [ "$FRIENDICA_VERSION" = "develop" ]; then + if echo "$FRIENDICA_VERSION" | grep -Eq '^.*(\-dev|-rc)'; then composer "install" fi @@ -187,7 +187,7 @@ update() { copy_sources log 'Upgrading Friendica' - if [ "$FRIENDICA_VERSION" = "develop" ]; then + if echo "$FRIENDICA_VERSION" | grep -Eq '^.*(\-dev|-rc)'; then composer "install" fi console "dbstructure update" diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index dce71b5..c8ee2ec 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -75,7 +75,7 @@ RUN {\ ENV AUTOINSTALL false ENV FRIENDICA_VERSION %%VERSION%% -ENV ADDONS_VERSION %%VERSION%% +ENV FRIENDICA_ADDONS %%VERSION%% %%INSTALL_EXTRAS%% COPY bin/* /usr/local/bin/ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 5532def..40ae16a 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -86,7 +86,7 @@ RUN {\ ENV AUTOINSTALL false ENV FRIENDICA_VERSION %%VERSION%% -ENV ADDONS_VERSION %%VERSION%% +ENV FRIENDICA_ADDONS %%VERSION%% %%INSTALL_EXTRAS%% COPY bin/* /usr/local/bin/