From dfa7bfeec9102aacc7b587951032aa89cb5ff2d4 Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Wed, 29 May 2024 14:45:43 +0100 Subject: [PATCH] Added a Dockerfile and docker-compose to this project The compose requieres the printer image too --- Dockerfile | 4 +++- Makefile | 2 ++ start.sh => container/start.sh | 6 +++--- docker-compose.yml | 36 ++++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 4 deletions(-) rename start.sh => container/start.sh (65%) create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile index 2a3b3cd..f329e50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ FROM alpine:20231219 +# Set the appropriate timezone +ENV TZ="Europe/Lisbon" # Install the required packages RUN apk --no-cache add bash zsh go make sqlite \ @@ -12,6 +14,6 @@ COPY ./src /frontend-src # Add the entrypoint USER $UNAME -COPY ./start.sh /start.sh +COPY ./container/start.sh /start.sh STOPSIGNAL SIGTERM ENTRYPOINT [ "/start.sh" ] diff --git a/Makefile b/Makefile index 7d41f80..fdbaa76 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,8 @@ attach-test: test: clean docker run \ --name esilva-fax-container-test \ + -v ./data.db:/data.db \ + -v ./src/config.yml:/etc/fax/config.yml \ -p 8083:8083 \ -it esilva-fax zsh diff --git a/start.sh b/container/start.sh similarity index 65% rename from start.sh rename to container/start.sh index b3a9d8c..351b2cc 100755 --- a/start.sh +++ b/container/start.sh @@ -1,15 +1,15 @@ #!/bin/sh set -e -# Start jellyfin -echo "nameserver 8.8.8.8" > /etc/resolv.conf - if [ ! -d /frontend ]; then + export GOPROXY="https://goproxy.io" cd /frontend-src + make clean make build mv build /frontend cd .. rm -r /frontend-src + ln -s /data.db /frontend/data.db fi cd /frontend diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..bd57360 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,36 @@ +networks: + esilva-faxnetwork: + name: esilva-faxnetwork + driver: bridge + +services: + esilva-fax: + hostname: esilva-fax + build: ./ + image: esilva-fax + container_name: esilva-fax-container + cap_add: + - NET_ADMIN + networks: + - esilva-faxnetwork + volumes: + - ./data.db:/data.db + - ./src/config.yml:/etc/fax/config.yml + ports: + - "8083:8083" + tmpfs: + - /tmp + restart: unless-stopped + + esilva-printer: + hostname: esilva-printer + build: ../gothermal/ + image: esilva-printer + container_name: esilva-printer-container + cap_add: + - NET_ADMIN + networks: + - esilva-faxnetwork + tmpfs: + - /tmp + restart: unless-stopped