knee-cola/evidencija-rezija
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/hotfix-hosts-file' into develop

Browse Source
This commit is contained in:
Nikola Derežić
2026-01-09 19:17:58 +01:00
parent 42d1f6276a 5cb0210668
commit 3366e85950
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker-stack/docker-compose-standalone.yaml
View File

@@ -26,7 +26,7 @@ services:
LINKEDIN_SECRET: ugf61aJ2iyErLK40 LINKEDIN_SECRET: ugf61aJ2iyErLK40
HOSTNAME: rezije.app # IP address at which the server will be listening (0.0.0.0 = listen on all addresses) 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) 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 security
SHARE_LINK_SECRET: ef68362357315d5decb27d24ff9abdb4a02a3351cd2899f79bf238dce0fe08c5 SHARE_LINK_SECRET: ef68362357315d5decb27d24ff9abdb4a02a3351cd2899f79bf238dce0fe08c5
SHARE_TTL_INITIAL_DAYS: 10 SHARE_TTL_INITIAL_DAYS: 10
@@ -41,7 +41,7 @@ services:
labels: labels:
- traefik.enable=true - traefik.enable=true
- traefik.docker.network=traefik-network # mreže preko koje ide komunikacija sa Traefikom - 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.entrypoints=http
- traefik.http.routers.web-app.rule=Host(`${FQDN:-rezije.app}`) - traefik.http.routers.web-app.rule=Host(`${FQDN:-rezije.app}`)

6
web-app/Dockerfile
View File

@@ -12,9 +12,6 @@ RUN apk add --no-cache libc6-compat
WORKDIR /app WORKDIR /app
# copy custom hosts file to avoid issues with some auth providers
COPY ./etc/hosts /etc/hosts
# Copy package files # Copy package files
COPY ./package.json ./package-lock.json ./ 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 # 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 --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 # Automatically leverage output traces to reduce image size
# https://nextjs.org/docs/advanced-features/output-file-tracing # https://nextjs.org/docs/advanced-features/output-file-tracing
COPY --from=builder --chown=nonroot:nonroot /app/.next/standalone ./ COPY --from=builder --chown=nonroot:nonroot /app/.next/standalone ./

4
web-app/package-lock.json generated
View File

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

2
web-app/package.json
View File

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