merge conflicts
This commit is contained in:
@@ -3,7 +3,7 @@ services:
|
|||||||
extends:
|
extends:
|
||||||
file: ${TEMPLATES_PATH}
|
file: ${TEMPLATES_PATH}
|
||||||
service: default
|
service: default
|
||||||
image: traefik:3.6.5
|
image: traefik:v3.6.6
|
||||||
container_name: traefik
|
container_name: traefik
|
||||||
ports:
|
ports:
|
||||||
- "80:80"
|
- "80:80"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ services:
|
|||||||
extends:
|
extends:
|
||||||
file: ${TEMPLATES_PATH}
|
file: ${TEMPLATES_PATH}
|
||||||
service: default
|
service: default
|
||||||
image: ghcr.io/mealie-recipes/mealie:v3.9.0
|
image: ghcr.io/mealie-recipes/mealie:v3.9.2
|
||||||
container_name: mealie
|
container_name: mealie
|
||||||
ports:
|
ports:
|
||||||
- "4006:9000"
|
- "4006:9000"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ services:
|
|||||||
extends:
|
extends:
|
||||||
file: ${TEMPLATES_PATH}
|
file: ${TEMPLATES_PATH}
|
||||||
service: default
|
service: default
|
||||||
image: bentopdf/bentopdf-simple:v1.15.3
|
image: bentopdf/bentopdf-simple:v1.15.4
|
||||||
container_name: pdf
|
container_name: pdf
|
||||||
ports:
|
ports:
|
||||||
- "4003:8080"
|
- "4003:8080"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ services:
|
|||||||
extends:
|
extends:
|
||||||
file: ${TEMPLATES_PATH}
|
file: ${TEMPLATES_PATH}
|
||||||
service: default
|
service: default
|
||||||
image: vaultwarden/server:1.35.0
|
image: vaultwarden/server:1.35.1
|
||||||
container_name: vaultwarden
|
container_name: vaultwarden
|
||||||
ports:
|
ports:
|
||||||
- 4018:80
|
- 4018:80
|
||||||
|
|||||||
Reference in New Issue
Block a user