diff --git a/services/registry/docker-compose.yml.j2 b/services/registry/docker-compose.yml.j2 index 1cd36d0f..b222ba6e 100644 --- a/services/registry/docker-compose.yml.j2 +++ b/services/registry/docker-compose.yml.j2 @@ -1,7 +1,7 @@ version: "3.7" services: registry: - image: registry:2.8.3 + image: registry:3.0.0 command: ["/bin/sh", "/etc/docker/registry/init"] environment: REGISTRY_HTTP_HOST: "https://${REGISTRY_DOMAIN}" @@ -31,6 +31,9 @@ services: REGISTRY_LOG_ACCESSLOG_DISABLED: ${REGISTRY_LOG_ACCESSLOG_DISABLED} # set to true if using self-signed certificates UPDATE_CERTIFICATES: "false" + # OpenTelemetry + OTEL_EXPORTER_OTLP_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}:${TRACING_OPENTELEMETRY_COLLECTOR_PORT} + OTEL_SERVICE_NAME: registry-simcore networks: - public - monitored @@ -77,7 +80,7 @@ services: {%- raw %} hostname: "registry-ptc-{{.Node.Hostname}}-{{.Task.Slot}}" {%- endraw %} - image: registry:2.8.3 + image: registry:3.0.0 environment: REGISTRY_HTTP_SECRET: ${REGISTRY_PULL_THROUGH_CACHE_HTTP_SECRET} # S3 @@ -100,6 +103,9 @@ services: # Logs REGISTRY_LOG_LEVEL: ${REGISTRY_PULL_THROUGH_CACHE_LOG_LEVEL} REGISTRY_LOG_ACCESSLOG_DISABLED: ${REGISTRY_PULL_THROUGH_CACHE_LOG_ACCESSLOG_DISABLED} + # OpenTelemetry + OTEL_EXPORTER_OTLP_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}:${TRACING_OPENTELEMETRY_COLLECTOR_PORT} + OTEL_SERVICE_NAME: registry-pull-through-cache ports: - mode: host target: 5000 diff --git a/services/registry/template.env b/services/registry/template.env index 664b5b65..6ba8661e 100644 --- a/services/registry/template.env +++ b/services/registry/template.env @@ -32,3 +32,6 @@ REGISTRY_PULL_THROUGH_CACHE_LOG_ACCESSLOG_DISABLED=${REGISTRY_PULL_THROUGH_CACHE DOCKER_HUB_LOGIN=${DOCKER_HUB_LOGIN} DOCKER_HUB_PASSWORD=${DOCKER_HUB_PASSWORD} + +TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT=${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT} +TRACING_OPENTELEMETRY_COLLECTOR_PORT=${TRACING_OPENTELEMETRY_COLLECTOR_PORT}