From a6381a4a7e26b88d977236aa81d9e935215d15b3 Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Sat, 13 Apr 2024 12:32:17 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=B3=20Update=20options=20and=20port=20?= =?UTF-8?q?for=20Dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 8 +++++++- Dockerfile | 2 +- docker-compose.yml | 12 ++++-------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.env b/.env index c0e28b94..c621c50a 100644 --- a/.env +++ b/.env @@ -24,6 +24,12 @@ # Defaults to true # REDIRECT_HTTPS=true +# The path to the user data directory +# USER_DATA_DIR=user-data + +# Override where the path to the configuration file is, can be a remote URL +# VUE_APP_CONFIG_PATH=/conf.yml + # Usually the same as BASE_URL, but accessible in frontend # VUE_APP_DOMAIN=https://dashy.to @@ -46,4 +52,4 @@ # VUE_APP_VERSION=2.0.0 # Directory for conf.yml backups -# BACKUP_DIR=./public/ +# BACKUP_DIR=./user-data/ diff --git a/Dockerfile b/Dockerfile index f04224f9..6b9a1fc4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,7 @@ RUN yarn build --mode production FROM node:20.11.1-alpine3.19 # Define some ENV Vars -ENV PORT=80 \ +ENV PORT=8080 \ DIRECTORY=/app \ IS_DOCKER=true diff --git a/docker-compose.yml b/docker-compose.yml index 0d09a26a..9eb391eb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,21 +12,17 @@ services: # To build from source, replace 'image: lissy93/dashy' with 'build: .' # build: . - # Or, to use a Dockerfile for your archtecture, uncomment the following - # context: . - # dockerfile: ./docker/Dockerfile-arm32v7 - # You can also use an image with a different tag, or pull from a different registry, e.g: - # image: ghcr.io/lissy93/dashy or image: lissy93/dashy:arm64v8 + # image: ghcr.io/lissy93/dashy or image: lissy93/dashy:3.0.0 # Pass in your config file below, by specifying the path on your host machine # volumes: - # - /path/to/my-config.yml:/app/public/conf.yml - # - /path/to/item-icons:/app/public/item-icons + # - /path/to/my-config.yml:/app/user-data/conf.yml + # - /path/to/item-icons:/app/user-data/item-icons/ # Set port that web service will be served on. Keep container port as 80 ports: - - 4000:80 + - 4000:8080 # Set any environmental variables environment: