From 05fbedb2cc59065cc6396fe635d0e24ea7782628 Mon Sep 17 00:00:00 2001 From: zijiren233 Date: Wed, 18 Oct 2023 15:31:09 +0800 Subject: [PATCH] Fix: config file default use datadir/config.yaml --- Dockerfile | 7 ++++--- cmd/root.go | 2 +- docker-compose.yml | 2 ++ entrypoint.sh | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index d202f87..803d3dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,9 +18,6 @@ ENV SERVER_LISTEN=0.0.0.0 ENV SERVER_PORT=8080 -# only log to stdout -ENV LOG_ENABLE=false - COPY --from=builder /synctv/build/synctv /usr/local/bin/synctv COPY entrypoint.sh /entrypoint.sh @@ -31,6 +28,10 @@ RUN chmod +x /entrypoint.sh ENV PUID=0 PGID=0 UMASK=022 +WORKDIR /opt/synctv + EXPOSE 8080/tcp 8080/udp +VOLUME [ "/opt/synctv" ] + CMD [ "/entrypoint.sh" ] diff --git a/cmd/root.go b/cmd/root.go index 9765d95..4fde36c 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -36,5 +36,5 @@ func init() { home = "~" } RootCmd.PersistentFlags().StringVar(&flags.DataDir, "data-dir", filepath.Join(home, ".synctv"), "data dir") - RootCmd.PersistentFlags().StringVarP(&flags.ConfigFile, "config", "f", filepath.Join(flags.DataDir, "config.yaml"), "config file path") + RootCmd.PersistentFlags().StringVarP(&flags.ConfigFile, "config", "f", "", "config file path") } diff --git a/docker-compose.yml b/docker-compose.yml index 47bbf68..0993c51 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,8 @@ services: ports: - '8080:8080/tcp' - '8080:8080/udp' + volumes: + - /opt/synctv:/opt/synctv environment: - PUID=0 - PGID=0 diff --git a/entrypoint.sh b/entrypoint.sh index 50fd505..cf6ab7a 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,7 +1,7 @@ #!/bin/bash -chown -R ${PUID}:${PGID} /opt/synctv/ +chown -R ${PUID}:${PGID} /opt/synctv umask ${UMASK} -exec su-exec ${PUID}:${PGID} synctv server --env-no-prefix --skip-config +exec su-exec ${PUID}:${PGID} synctv server --env-no-prefix --data-dir /opt/synctv