Merge branch 'release/2.21.2'

docker-stack/docker-compose-standalone.yaml

@@ -26,7 +26,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 +41,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}`)
 

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 ./
 
@@ -41,6 +38,9 @@ COPY --from=builder /app/public/* /app/public/
 # this file is required for the pdfjs-dist package
 COPY --from=builder /app/node_modules/pdfjs-dist/build/pdf.worker.min.mjs /app/public/pdf.worker.min.mjs
 
+# copy custom hosts file to avoid issues with some auth providers
+COPY ./etc/hosts /etc/hosts
+
 # Automatically leverage output traces to reduce image size
 # https://nextjs.org/docs/advanced-features/output-file-tracing
 COPY --from=builder --chown=nonroot:nonroot /app/.next/standalone ./

web-app/package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "evidencija-rezija",
-  "version": "2.21.1",
+  "version": "2.21.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "version": "2.21.1",
+      "version": "2.21.2",
       "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.2"
 }