mastodon: fix master

This commit is contained in:
Wonderfall 2017-07-14 05:54:27 +02:00
parent bc6c5d4864
commit b1c326e678

View File

@ -19,6 +19,7 @@ RUN apk -U upgrade \
ffmpeg \ ffmpeg \
file \ file \
git \ git \
icu-libs \
imagemagick \ imagemagick \
libpq \ libpq \
libressl \ libressl \
@ -36,6 +37,7 @@ RUN apk -U upgrade \
su-exec \ su-exec \
&& apk add -t build-dependencies \ && apk add -t build-dependencies \
build-base \ build-base \
icu-dev \
libffi-dev \ libffi-dev \
libxml2-dev \ libxml2-dev \
libxslt-dev \ libxslt-dev \
@ -51,7 +53,7 @@ RUN apk -U upgrade \
&& bundle install --deployment --clean --no-cache --without test development \ && bundle install --deployment --clean --no-cache --without test development \
&& npm install -g npm@3 && npm install -g yarn \ && npm install -g npm@3 && npm install -g yarn \
&& yarn --ignore-optional --pure-lockfile \ && yarn --ignore-optional --pure-lockfile \
&& SECRET_KEY_BASE=$(rake secret) rake assets:precompile \ && SECRET_KEY_BASE=$(rake secret) SMTP_FROM_ADDRESS= rake assets:precompile \
&& npm -g cache clean && yarn cache clean \ && npm -g cache clean && yarn cache clean \
&& mv public/assets /tmp/assets && mv public/packs /tmp/packs \ && mv public/assets /tmp/assets && mv public/packs /tmp/packs \
&& apk del build-dependencies \ && apk del build-dependencies \