Merge branch 'hotfix/2.3.3'

This commit is contained in:
Knee Cola
2025-11-24 22:45:54 +01:00

View File

@@ -5,8 +5,8 @@ networks:
traefik-network: traefik-network:
name: traefik-network name: traefik-network
external: true external: true
mongo-network: util-bills-mongo-network:
name: mongo-network name: util-bills-mongo-network
internal: true # bridge network, isolated from host and other networks internal: true # bridge network, isolated from host and other networks
services: services:
@@ -16,13 +16,13 @@ services:
restart: unless-stopped # u slučaju rušenja containera pokušavaj ga pokrenuti dok ne uspije = BESKONAČNO restart: unless-stopped # u slučaju rušenja containera pokušavaj ga pokrenuti dok ne uspije = BESKONAČNO
networks: networks:
- traefik-network - traefik-network
- mongo-network - util-bills-mongo-network
depends_on: depends_on:
- mongo - mongo
volumes: volumes:
- ./etc/hosts/:/etc/hosts - ./etc/hosts/:/etc/hosts
environment: environment:
MONGODB_URI: mongodb://root:example@mongo:27017/ MONGODB_URI: mongodb://rezije.app:w4z4piJBgCdAm4tpawqB@mongo:27017/utility-bills
GOOGLE_ID: 355397364527-adjrokm6hromcaaar0qfhk050mfr35ou.apps.googleusercontent.com GOOGLE_ID: 355397364527-adjrokm6hromcaaar0qfhk050mfr35ou.apps.googleusercontent.com
GOOGLE_SECRET: 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 GOOGLE_SECRET: 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
AUTH_SECRET: Gh0jQ35oq6DR8HkLR3heA8EaEDtxYN/xkP6blvukZ0w= AUTH_SECRET: Gh0jQ35oq6DR8HkLR3heA8EaEDtxYN/xkP6blvukZ0w=
@@ -48,7 +48,7 @@ services:
volumes: volumes:
- ./mongo-volume:/data/db - ./mongo-volume:/data/db
networks: networks:
- mongo-network - util-bills-mongo-network
mongo-express: mongo-express:
image: mongo-express image: mongo-express
@@ -56,13 +56,13 @@ services:
restart: unless-stopped restart: unless-stopped
networks: networks:
- traefik-network - traefik-network
- mongo-network - util-bills-mongo-network
depends_on: depends_on:
- mongo - mongo
environment: environment:
ME_CONFIG_MONGODB_ADMINUSERNAME: root ME_CONFIG_MONGODB_ADMINUSERNAME: root
ME_CONFIG_MONGODB_ADMINPASSWORD: example ME_CONFIG_MONGODB_ADMINPASSWORD: HjktJCPWMBtM1ACrDaw7
ME_CONFIG_MONGODB_URL: mongodb://root:example@mongo:27017/ ME_CONFIG_MONGODB_URL: mongodb://root:HjktJCPWMBtM1ACrDaw7@mongo:27017/
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