Commit e42fac94 authored by Michał Woźniak's avatar Michał Woźniak

Applying Craue migrations patches, should fix #2

parent a4b6ddb0
......@@ -57,7 +57,7 @@ RUN set -ex \
# clone the original repo
RUN git clone --branch $WALLABAG_VERSION --depth 1 https://github.com/wallabag/wallabag.git /var/www/wallabag
# prepare the patch (and clean up afterwards)
# prepare the LDAP patch (and clean up afterwards)
RUN PATCHTEMP=$( mktemp -d ) \
&& git clone https://git.immae.eu/github/wallabag/wallabag.git $PATCHTEMP \
&& cd $PATCHTEMP \
......@@ -66,10 +66,21 @@ RUN PATCHTEMP=$( mktemp -d ) \
&& cd / \
&& rm -rf $PATCHTEMP
# apply the patch
# prepare the Craue migrations patch
RUN PATCHTEMP=$( mktemp -d ) \
&& git clone --branch fix-3662 https://github.com/Nadrieril/wallabag.git $PATCHTEMP \
&& cd $PATCHTEMP \
&& git format-patch -3 --stdout > /var/www/wallabag/wallabag-craue-migrations.patch \
&& cd / \
&& rm -rf $PATCHTEMP
# apply all patches
RUN cd /var/www/wallabag/ \
&& patch -p1 -i wallabag-ldap.patch \
&& rm wallabag-ldap.patch
&& rm wallabag-ldap.patch \
&& git apply -v wallabag-craue-migrations.patch \
&& rm wallabag-craue-migrations.patch
COPY root /
......
......@@ -20,9 +20,6 @@ if [ "$1" = "wallabag" ] || [ "$1" = "migrate" ];then
# run migrations
cd /var/www/wallabag/
su -c "bin/console doctrine:migrations:migrate --env=prod --no-interaction" -s /bin/sh nobody
# some things do not seem to be handled by migrations, sadly
# https://github.com/wallabag/wallabag/pull/3868
su -c "bin/console wallabag:install --env=prod --no-interaction" -s /bin/sh nobody
# run php-fpm7
exec php-fpm7 -F
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment