friendica
/
docker
mirror of https://github.com/friendica/docker
2
0
Fork 0
Code Issues Releases Wiki Activity

Bugfixings 

- `.bin/friendica` - update didn't execute composer
- `.bin/friendica` - rsync deleted the `.htconfig.php`
- `.bin/friendica` - wrong "addon" version variable
This commit is contained in:
Philipp Holzer 2018-05-24 22:38:25 +02:00
parent b46fae9173
commit aea96cb91c
No known key found for this signature in database
GPG Key ID: 58160D7D6AF942B6
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.bin/friendica
View File

@ -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"

2
2018.05-rc/apache/Dockerfile
View File

@ -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/

6
2018.05-rc/apache/bin/friendica
View File

@ -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"

2
2018.05-rc/fpm-alpine/Dockerfile
View File

@ -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/

6
2018.05-rc/fpm-alpine/bin/friendica
View File

@ -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"

2
2018.05-rc/fpm/Dockerfile
View File

@ -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/

6
2018.05-rc/fpm/bin/friendica
View File

@ -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"

2
Dockerfile-alpine.template
View File

@ -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/

2
Dockerfile-debian.template
View File

@ -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/