diff --git a/mastodon/Dockerfile.rc.targaryen b/mastodon/Dockerfile.rc.targaryen index f3ff098..7b6a6c2 100644 --- a/mastodon/Dockerfile.rc.targaryen +++ b/mastodon/Dockerfile.rc.targaryen @@ -1,6 +1,6 @@ FROM alpine:3.6 -ARG VERSION=v1.5.0rc1 +ARG VERSION=v1.5.0rc2 ARG REPOSITORY=tootsuite/mastodon ENV UID=991 GID=991 \ diff --git a/mastodon/rootfs/usr/local/bin/run b/mastodon/rootfs/usr/local/bin/run index d021517..78d5c0e 100644 --- a/mastodon/rootfs/usr/local/bin/run +++ b/mastodon/rootfs/usr/local/bin/run @@ -36,8 +36,8 @@ addgroup -g ${GID} mastodon &>/dev/null adduser -h /mastodon -s /bin/sh -D -G mastodon -u ${UID} mastodon &>/dev/null echo "Moving assets to volumes..." -mv /tmp/assets/* public/assets &>/dev/null -mv /tmp/packs/* public/packs &>/dev/null +cp -r /tmp/assets/* public/assets &>/dev/null +cp -r /tmp/packs/* public/packs &>/dev/null echo "Updating permissions, this can take a while..." find /mastodon -path /mastodon/public/system -prune -o -not -user mastodon -not -group mastodon -print0 | xargs -0 chown -f mastodon:mastodon