refactor: simplify docker image definitions by removing custom registry placeholders
This commit is contained in:
parent
59f608b553
commit
cafb3935cb
|
|
@ -7,7 +7,7 @@ services:
|
|||
|
||||
# --- DATABASE: PostgreSQL ---
|
||||
postgres:
|
||||
image: "${DOCKER_REGISTRY:-git.mo-code.at/Mocode-Software}/postgres:${POSTGRES_IMAGE:-postgres:16-alpine}"
|
||||
image: "${POSTGRES_IMAGE:-postgres:16-alpine}"
|
||||
container_name: "${PROJECT_NAME:-meldestelle}-postgres"
|
||||
# OPTIMIERUNG: Automatischer Neustart bei System-Reboot
|
||||
restart: unless-stopped
|
||||
|
|
@ -46,7 +46,7 @@ services:
|
|||
# --- CACHE: Valkey (formerly Redis) ---
|
||||
valkey:
|
||||
# Valkey 9.0 (User Request)
|
||||
image: "${DOCKER_REGISTRY:-git.mo-code.at/Mocode-Software}/valkey:${VALKEY_IMAGE:-valkey/valkey:9-alpine}"
|
||||
image: "${VALKEY_IMAGE:-valkey/valkey:9-alpine}"
|
||||
container_name: "${PROJECT_NAME:-meldestelle}-valkey"
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
|
|
@ -121,7 +121,7 @@ services:
|
|||
|
||||
# --- SERVICE DISCOVERY: Consul ---
|
||||
consul:
|
||||
image: "${DOCKER_REGISTRY:-git.mo-code.at/Mocode-Software}/consul:${CONSUL_IMAGE:-hashicorp/consul:1.22.1}"
|
||||
image: "${CONSUL_IMAGE:-hashicorp/consul:1.22.1}"
|
||||
container_name: "${PROJECT_NAME:-meldestelle}-consul"
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
|
|
@ -139,7 +139,7 @@ services:
|
|||
|
||||
# --- TRACING: Zipkin ---
|
||||
zipkin:
|
||||
image: "${DOCKER_REGISTRY:-git.mo-code.at/Mocode-Software}/zipkin:${ZIPKIN_IMAGE:-openzipkin/zipkin:3}"
|
||||
image: "${ZIPKIN_IMAGE:-openzipkin/zipkin:3}"
|
||||
container_name: "${PROJECT_NAME:-meldestelle}-zipkin"
|
||||
restart: unless-stopped # Geändert für Zora
|
||||
environment:
|
||||
|
|
@ -147,13 +147,13 @@ services:
|
|||
JAVA_OPTS: "-Xms${ZIPKIN_HEAP:-256m} -Xmx${ZIPKIN_HEAP:-512m}"
|
||||
ports:
|
||||
- "${ZIPKIN_PORT:-9411:9411}"
|
||||
profiles: [ "ops", "all" ] # Geändert auf 'ops', um es optionaler zu machen
|
||||
profiles: [ "infra", "all" ] # Geändert auf 'ops', um es optionaler zu machen
|
||||
networks:
|
||||
meldestelle-network:
|
||||
|
||||
# --- EMAIL TESTING: Mailpit ---
|
||||
mailpit:
|
||||
image: "${DOCKER_REGISTRY:-git.mo-code.at/Mocode-Software}/mailpit:${MAILPIT_IMAGE:-axllent/mailpit:v1.29}"
|
||||
image: "${MAILPIT_IMAGE:-axllent/mailpit:v1.29}"
|
||||
container_name: "${PROJECT_NAME:-meldestelle}-mailpit"
|
||||
restart: unless-stopped # Geändert für Zora
|
||||
ports:
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user