diff --git a/Dockerfile b/Dockerfile index 6181f78..b5b1153 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617 -RUN mkdir -p /app/code +RUN mkdir -p /app/code /app/pkg WORKDIR /app/code ARG VERSION=3.0.1 @@ -47,7 +47,7 @@ RUN ln -fs /run/mastodon/bullet.log /app/code/log/bullet.log RUN ln -fs /app/data/system /app/code/public/system RUN rm -rf /app/code/tmp && ln -fs /tmp/mastodon /app/code/tmp -COPY start.sh env.template /app/code/ +COPY start.sh env.template /app/pkg/ -CMD [ "/app/code/start.sh" ] +CMD [ "/app/pkg/start.sh" ] diff --git a/start.sh b/start.sh index 5832e22..71bba91 100755 --- a/start.sh +++ b/start.sh @@ -6,7 +6,7 @@ mkdir -p /tmp/mastodon /app/data/system /run/mastodon if [[ ! -f /app/data/env.production ]]; then echo "==> Copying env template on first run" - cp /app/code/env.template /app/data/env.production + cp /app/pkg/env.template /app/data/env.production fi echo "==> Configuring mastodon"