From c9cc32b811cbff9585b615df0bd181022eaf9d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Dere=C5=BEi=C4=87?= Date: Fri, 9 Jan 2026 18:49:00 +0100 Subject: [PATCH 1/3] (config) Convert docker-compose paths to absolute for Portainer compatibility Changed relative volume paths to absolute paths and updated image reference to use full registry path. This enables deployment via Portainer which doesn't have working directory context. Co-Authored-By: Claude Sonnet 4.5 --- docker-stack/docker-compose-standalone.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-stack/docker-compose-standalone.yaml b/docker-stack/docker-compose-standalone.yaml index 38d7610..5690d73 100644 --- a/docker-stack/docker-compose-standalone.yaml +++ b/docker-stack/docker-compose-standalone.yaml @@ -13,12 +13,12 @@ networks: services: web-app: - image: utility-bills-tracker:${IMAGE_VERSION} + image: registry.budakova.org/knee-cola/utility-bills-tracker:${IMAGE_VERSION} networks: - traefik-network - util-bills-mongo-network volumes: - - ./web-app/etc/hosts/:/etc/hosts + - /home/knee-cola/docker/evidencija-rezija/web-app/etc/hosts/:/etc/hosts environment: MONGODB_URI: mongodb://rezije.app:w4z4piJBgCdAm4tpawqB@mongo:27017/utility-bills GOOGLE_ID: 355397364527-adjrokm6hromcaaar0qfhk050mfr35ou.apps.googleusercontent.com @@ -55,8 +55,8 @@ services: MONGO_INITDB_ROOT_USERNAME: root MONGO_INITDB_ROOT_PASSWORD: example volumes: - - ./mongo-volume:/data/db - - ./mongo-backup:/backup + - /home/knee-cola/docker/evidencija-rezija/mongo-volume:/data/db + - /home/knee-cola/docker/evidencija-rezija/mongo-backup:/backup networks: - util-bills-mongo-network mongo-express: From de97ce744fa88281a090846f5359e9fad507028f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Dere=C5=BEi=C4=87?= Date: Fri, 9 Jan 2026 18:51:05 +0100 Subject: [PATCH 2/3] (refactor) Move hosts file copy from volume mount to Dockerfile Bake the custom hosts file into the Docker image instead of mounting it as a volume. This simplifies deployment configuration and makes the image more self-contained. Co-Authored-By: Claude Sonnet 4.5 --- docker-stack/docker-compose-standalone.yaml | 2 -- web-app/Dockerfile | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker-stack/docker-compose-standalone.yaml b/docker-stack/docker-compose-standalone.yaml index 5690d73..92d6dbf 100644 --- a/docker-stack/docker-compose-standalone.yaml +++ b/docker-stack/docker-compose-standalone.yaml @@ -17,8 +17,6 @@ services: networks: - traefik-network - util-bills-mongo-network - volumes: - - /home/knee-cola/docker/evidencija-rezija/web-app/etc/hosts/:/etc/hosts environment: MONGODB_URI: mongodb://rezije.app:w4z4piJBgCdAm4tpawqB@mongo:27017/utility-bills GOOGLE_ID: 355397364527-adjrokm6hromcaaar0qfhk050mfr35ou.apps.googleusercontent.com diff --git a/web-app/Dockerfile b/web-app/Dockerfile index a83f43e..85b8958 100644 --- a/web-app/Dockerfile +++ b/web-app/Dockerfile @@ -12,6 +12,9 @@ RUN apk add --no-cache libc6-compat WORKDIR /app +# copy custom hosts file to avoid issues with some auth providers +COPY ./etc/hosts /etc/hosts + # Copy package files COPY ./package.json ./package-lock.json ./ From d17efdc15652e4af898a11d341a36f7d8bd2adf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Dere=C5=BEi=C4=87?= Date: Fri, 9 Jan 2026 18:51:40 +0100 Subject: [PATCH 3/3] (ver) web-app: version bump --- web-app/package-lock.json | 4 ++-- web-app/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web-app/package-lock.json b/web-app/package-lock.json index febce4d..aa1e6ec 100644 --- a/web-app/package-lock.json +++ b/web-app/package-lock.json @@ -1,11 +1,11 @@ { "name": "evidencija-rezija", - "version": "2.21.0", + "version": "2.21.1", "lockfileVersion": 3, "requires": true, "packages": { "": { - "version": "2.21.0", + "version": "2.21.1", "dependencies": { "@emotion/react": "^11.14.0", "@emotion/styled": "^11.14.1", diff --git a/web-app/package.json b/web-app/package.json index 822537c..bc0c2f2 100644 --- a/web-app/package.json +++ b/web-app/package.json @@ -58,5 +58,5 @@ "engines": { "node": ">=18.17.0" }, - "version": "2.21.0" + "version": "2.21.1" }