From b6fecdf23cdfc9498a0959d5dc7c89e09d275650 Mon Sep 17 00:00:00 2001 From: Dan Anglin Date: Sun, 30 Jul 2023 01:55:21 +0100 Subject: [PATCH] refactor(gts): update Dockerfile - Copy files from the context from within the RUN directive since the context directory is mounted in the container. - Finalise the WORKDIR to /flow/gts --- templates/gotosocial/Dockerfile.gotmpl | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/templates/gotosocial/Dockerfile.gotmpl b/templates/gotosocial/Dockerfile.gotmpl index e963c68..218ab45 100644 --- a/templates/gotosocial/Dockerfile.gotmpl +++ b/templates/gotosocial/Dockerfile.gotmpl @@ -12,16 +12,15 @@ RUN --mount=type=bind,source=.,target=/packages \ && tar xzvf /packages/gotosocial_{{ .GoToSocial.Version }}_web-assets.tar.gz \ && mv /tmp/gotosocial /usr/local/bin/gotosocial \ && mv /tmp/web /flow/gts \ + && cp /packages/entrypoint.sh /usr/local/bin/entrypoint \ + && cp /packages/config.yaml /flow/gts/config/config.yaml \ + && cp /packages/assets/images/background.jpg /flow/gts/web/assets/background.jpg \ && chown -R {{ .GoToSocial.LinuxUID }}:{{ .FlowGID }} /flow/gts \ + && chmod a+x /usr/local/bin/entrypoint \ && rm -rf /tmp/* -COPY --chown={{ .GoToSocial.LinuxUID }}:{{ .GoToSocial.LinuxUID }} entrypoint.sh /usr/local/bin/entrypoint -COPY --chown={{ .GoToSocial.LinuxUID }}:{{ .GoToSocial.LinuxUID }} config.yaml /flow/gts/config/config.yaml -COPY --chown={{ .GoToSocial.LinuxUID }}:{{ .GoToSocial.LinuxUID }} assets/images/background.jpg /flow/gts/web/assets/background.jpg -COPY --chown={{ .GoToSocial.LinuxUID }}:{{ .FlowGID }} traefik_gotosocial.yaml /flow/gts/tmp/traefik_gotosocial.yaml - -RUN chmod a+x /usr/local/bin/entrypoint - USER {{ .GoToSocial.LinuxUID }}:{{ .FlowGID }} +WORKDIR /flow/gts + ENTRYPOINT ["entrypoint"]