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

Merge branch 'hotfix/2.3.1'

Browse Source
This commit is contained in:
Knee Cola
2025-11-24 22:33:10 +01:00
parent f7b4941e1e 7dc3048dbc
commit 0b2b8c9af7
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker-compose-debug.yml
View File

@@ -2,7 +2,7 @@
version: "3.7" version: "3.7"
services: services:
util-bills-mongo: mongo:
image: mongo:4.4.27 image: mongo:4.4.27
ulimits: ulimits:
nofile: nofile:
@@ -16,7 +16,7 @@ services:
MONGO_INITDB_ROOT_PASSWORD: example MONGO_INITDB_ROOT_PASSWORD: example
volumes: volumes:
- ./mongo-volume:/data/db - ./mongo-volume:/data/db
util-bills-mongo-express: mongo-express:
image: mongo-express image: mongo-express
restart: always restart: always
ports: ports:
@@ -24,5 +24,5 @@ services:
environment: environment:
ME_CONFIG_MONGODB_ADMINUSERNAME: root ME_CONFIG_MONGODB_ADMINUSERNAME: root
ME_CONFIG_MONGODB_ADMINPASSWORD: HjktJCPWMBtM1ACrDaw7 ME_CONFIG_MONGODB_ADMINPASSWORD: HjktJCPWMBtM1ACrDaw7
ME_CONFIG_MONGODB_URL: mongodb://root:HjktJCPWMBtM1ACrDaw7@util-bills-mongo:27017/ ME_CONFIG_MONGODB_URL: mongodb://root:HjktJCPWMBtM1ACrDaw7@mongo:27017/

10
docker-compose-deploy.yml
View File

@@ -12,7 +12,7 @@ networks:
internal: true internal: true
services: services:
util-bills-app: app:
image: utility-bills-tracker:${IMAGE_VERSION} image: utility-bills-tracker:${IMAGE_VERSION}
networks: networks:
- traefik-network - traefik-network
@@ -20,7 +20,7 @@ services:
volumes: volumes:
- ./etc/hosts/:/etc/hosts - ./etc/hosts/:/etc/hosts
environment: environment:
MONGODB_URI: mongodb://rezije.app:w4z4piJBgCdAm4tpawqB@util-bills-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
GOOGLE_SECRET: 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 GOOGLE_SECRET: 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
AUTH_SECRET: Gh0jQ35oq6DR8HkLR3heA8EaEDtxYN/xkP6blvukZ0w= AUTH_SECRET: Gh0jQ35oq6DR8HkLR3heA8EaEDtxYN/xkP6blvukZ0w=
@@ -41,7 +41,7 @@ services:
- traefik.http.services.web-app.loadbalancer.server.port=80 - traefik.http.services.web-app.loadbalancer.server.port=80
- 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}`)
util-bills-mongo: mongo:
image: mongo:4.4.27 image: mongo:4.4.27
ulimits: ulimits:
nofile: nofile:
@@ -54,12 +54,12 @@ services:
- ./mongo-volume:/data/db - ./mongo-volume:/data/db
networks: networks:
- mongo-network - mongo-network
util-bills-mongo-express: mongo-express:
image: mongo-express image: mongo-express
environment: environment:
ME_CONFIG_MONGODB_ADMINUSERNAME: root ME_CONFIG_MONGODB_ADMINUSERNAME: root
ME_CONFIG_MONGODB_ADMINPASSWORD: HjktJCPWMBtM1ACrDaw7 ME_CONFIG_MONGODB_ADMINPASSWORD: HjktJCPWMBtM1ACrDaw7
ME_CONFIG_MONGODB_URL: mongodb://root:HjktJCPWMBtM1ACrDaw7@util-bills-mongo:27017/ ME_CONFIG_MONGODB_URL: mongodb://root:HjktJCPWMBtM1ACrDaw7@mongo:27017/
networks: networks:
- traefik-network - traefik-network
- mongo-network - mongo-network