Merge branch 'hotfix/2.21.3'

Docker overwrites /etc/hosts at container runtime, so copying it during
build (COPY command) or mounting it as volume doesn't work reliably.
Moved to extra_hosts in docker-compose files for both standalone and
swarm deployments.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

docker-stack/docker-compose-standalone.yaml

@@ -17,6 +17,11 @@ services:
     networks:
       - traefik-network
       - util-bills-mongo-network
+    # NextJS will do name resolution for `rezije.app` and will crash if it
+    # resolves to an IP adress different from the one assigned to the Docker container.
+    # This will prevent that from happening.
+    extra_hosts: 
+      - "rezije.app:0.0.0.0"
     environment:
       MONGODB_URI: mongodb://rezije.app:w4z4piJBgCdAm4tpawqB@mongo:27017/utility-bills
       GOOGLE_ID: 355397364527-adjrokm6hromcaaar0qfhk050mfr35ou.apps.googleusercontent.com
@@ -26,7 +31,7 @@ services:
       LINKEDIN_SECRET: ugf61aJ2iyErLK40
       HOSTNAME: rezije.app # IP address at which the server will be listening (0.0.0.0 = listen on all addresses)
       NEXTAUTH_URL: https://rezije.app # URL next-auth will use while redirecting user during authentication (if not set - will use HOSTNAME)
-      PORT: ${PORT:-80}
+      PORT: ${PORT:-3000}
       # Share link security
       SHARE_LINK_SECRET: ef68362357315d5decb27d24ff9abdb4a02a3351cd2899f79bf238dce0fe08c5
       SHARE_TTL_INITIAL_DAYS: 10
@@ -41,7 +46,7 @@ services:
     labels:
       - traefik.enable=true
       - traefik.docker.network=traefik-network # mreže preko koje ide komunikacija sa Traefikom
-      - traefik.http.services.web-app.loadbalancer.server.port=80
+      - traefik.http.services.web-app.loadbalancer.server.port=3000
       - traefik.http.routers.web-app.entrypoints=http
       - traefik.http.routers.web-app.rule=Host(`${FQDN:-rezije.app}`)
 

docker-stack/docker-compose-swarm.yml

@@ -17,8 +17,11 @@ services:
     networks:
       - traefik-network
       - util-bills-mongo-network
-    volumes:
+    # NextJS will do name resolution for `rezije.app` and will crash if it
-      - ./web-app/etc/hosts/:/etc/hosts
+    # resolves to an IP adress different from the one assigned to the Docker container.
+    # This will prevent that from happening.
+    extra_hosts:
+      - "rezije.app:0.0.0.0"
     environment:
       MONGODB_URI: mongodb://rezije.app:w4z4piJBgCdAm4tpawqB@mongo:27017/utility-bills
       GOOGLE_ID: 355397364527-adjrokm6hromcaaar0qfhk050mfr35ou.apps.googleusercontent.com

web-app/Dockerfile

@@ -12,9 +12,6 @@ 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 ./
 

web-app/etc/hosts

@@ -1,10 +0,0 @@
-127.0.0.1	localhost
-::1	localhost ip6-localhost ip6-loopback
-fe00::0	ip6-localnet
-ff00::0	ip6-mcastprefix
-ff02::1	ip6-allnodes
-ff02::2	ip6-allrouters
-# NextJS will do name resolution for `rezije.app` and will crash if it
-# resolves to an IP adress different from the one assigned to the Docker container.
-# This will prevent that from happening.
-0.0.0.0 rezije.app 

web-app/package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "evidencija-rezija",
-  "version": "2.21.1",
+  "version": "2.21.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "version": "2.21.1",
+      "version": "2.21.3",
       "dependencies": {
         "@emotion/react": "^11.14.0",
         "@emotion/styled": "^11.14.1",

web-app/package.json

@@ -58,5 +58,5 @@
   "engines": {
     "node": ">=18.17.0"
   },
-  "version": "2.21.1"
+  "version": "2.21.3"
 }