diff --git a/Dockerfile b/Dockerfile index f0c6f69..ba0e6e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,10 +14,11 @@ RUN apk add --no-cache \ && GOPATH=`pwd`:`pwd`/vendor go build -o bin/import_synapse ./src/github.com/turt2live/matrix-media-repo/cmd/import_synapse/ \ && cp bin/media_repo bin/import_synapse /usr/local/bin \ && cp config.sample.yaml /etc/media-repo.yaml.sample \ + && cp -R migrations /var/lib/media-repo-migrations \ && cd / \ && rm -rf /tmp/* \ && apk del build-deps COPY root / -VOLUME /data +VOLUME ["/data", "/media"] EXPOSE 8000 diff --git a/root/etc/s6.d/media-repo/run b/root/etc/s6.d/media-repo/run index 7a57532..932a262 100755 --- a/root/etc/s6.d/media-repo/run +++ b/root/etc/s6.d/media-repo/run @@ -1,10 +1,9 @@ #!/usr/bin/env sh - -chown -R ${UID}:${GID} /data cd /data - if [ ! -f media-repo.yaml ]; then cp /etc/media-repo.yaml.sample media-repo.yaml fi +cp -R /var/lib/media-repo-migrations migrations +chown -R ${UID}:${GID} /data exec su-exec ${UID}:${GID} media_repo