From fbda01a5fee866e79e2b11e09757128d9d4d149d Mon Sep 17 00:00:00 2001 From: Ethan O'Brien Date: Thu, 4 Jul 2024 16:21:03 -0500 Subject: [PATCH] Update docker to be better --- docker/Dockerfile | 2 +- docker/docker-compose.yml | 3 ++- docker/start.sh | 10 ++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 docker/start.sh diff --git a/docker/Dockerfile b/docker/Dockerfile index ca34dab..7b4284e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -15,7 +15,7 @@ WORKDIR /ew/ RUN . "$HOME/.cargo/env" && cargo build --release RUN mkdir /root/ew/ && cp target/release/ew /root/ew/ew -RUN echo "#!/bin/bash\n\n /root/ew/ew --path \"\${DIRECTORY:-/data/}\" --port \"\${PORT:-8080}\"" > /root/ew/start.sh +COPY ./start.sh /root/ew/start.sh RUN chmod +x /root/ew/start.sh diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 6dbcbe1..219bb00 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -7,7 +7,8 @@ services: dockerfile: "./Dockerfile" environment: PORT: 8081 - DIRECTORY: /data + DIRECTORY: /data/ + HTTPS: false ports: - 8081:8081 volumes: diff --git a/docker/start.sh b/docker/start.sh new file mode 100644 index 0000000..7540d55 --- /dev/null +++ b/docker/start.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +port="${PORT:-8080}" +directory="${DIRECTORY:-/data/}" + +if [ "$HTTPS" = "true" ]; then + /root/ew/ew --path $directory --port $port --https +else + /root/ew/ew --path $directory --port $port +fi