Merge branch 'hotfix/2.21.3'
This commit is contained in:
@@ -17,6 +17,11 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- traefik-network
|
- traefik-network
|
||||||
- util-bills-mongo-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:
|
environment:
|
||||||
MONGODB_URI: mongodb://rezije.app:w4z4piJBgCdAm4tpawqB@mongo:27017/utility-bills
|
MONGODB_URI: mongodb://rezije.app:w4z4piJBgCdAm4tpawqB@mongo:27017/utility-bills
|
||||||
GOOGLE_ID: 355397364527-adjrokm6hromcaaar0qfhk050mfr35ou.apps.googleusercontent.com
|
GOOGLE_ID: 355397364527-adjrokm6hromcaaar0qfhk050mfr35ou.apps.googleusercontent.com
|
||||||
|
|||||||
@@ -17,8 +17,11 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- traefik-network
|
- traefik-network
|
||||||
- util-bills-mongo-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:
|
environment:
|
||||||
MONGODB_URI: mongodb://rezije.app:w4z4piJBgCdAm4tpawqB@mongo:27017/utility-bills
|
MONGODB_URI: mongodb://rezije.app:w4z4piJBgCdAm4tpawqB@mongo:27017/utility-bills
|
||||||
GOOGLE_ID: 355397364527-adjrokm6hromcaaar0qfhk050mfr35ou.apps.googleusercontent.com
|
GOOGLE_ID: 355397364527-adjrokm6hromcaaar0qfhk050mfr35ou.apps.googleusercontent.com
|
||||||
|
|||||||
@@ -38,9 +38,6 @@ 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 ./
|
||||||
|
|||||||
@@ -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
|
|
||||||
4
web-app/package-lock.json
generated
4
web-app/package-lock.json
generated
@@ -1,11 +1,11 @@
|
|||||||
{
|
{
|
||||||
"name": "evidencija-rezija",
|
"name": "evidencija-rezija",
|
||||||
"version": "2.21.2",
|
"version": "2.21.3",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"version": "2.21.2",
|
"version": "2.21.3",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@emotion/react": "^11.14.0",
|
"@emotion/react": "^11.14.0",
|
||||||
"@emotion/styled": "^11.14.1",
|
"@emotion/styled": "^11.14.1",
|
||||||
|
|||||||
@@ -58,5 +58,5 @@
|
|||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=18.17.0"
|
"node": ">=18.17.0"
|
||||||
},
|
},
|
||||||
"version": "2.21.2"
|
"version": "2.21.3"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user