Skip to content

Commit 68933ce

Browse files
committed
Revert "⚗️ upgrade distribution registry to v3.0.0, add tracing (ITISFoundation#1182)"
This reverts commit 63b6a48.
1 parent 92fa328 commit 68933ce

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

services/registry/docker-compose.yml.j2

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: "3.7"
22
services:
33
registry:
4-
image: registry:3.0.0
4+
image: registry:2.8.3
55
command: ["/bin/sh", "/etc/docker/registry/init"]
66
environment:
77
REGISTRY_HTTP_HOST: "https://${REGISTRY_DOMAIN}"
@@ -31,9 +31,6 @@ services:
3131
REGISTRY_LOG_ACCESSLOG_DISABLED: ${REGISTRY_LOG_ACCESSLOG_DISABLED}
3232
# set to true if using self-signed certificates
3333
UPDATE_CERTIFICATES: "false"
34-
# OpenTelemetry
35-
OTEL_EXPORTER_OTLP_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}:${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
36-
OTEL_SERVICE_NAME: registry-simcore
3734
networks:
3835
- public
3936
- monitored
@@ -80,7 +77,7 @@ services:
8077
{%- raw %}
8178
hostname: "registry-ptc-{{.Node.Hostname}}-{{.Task.Slot}}"
8279
{%- endraw %}
83-
image: registry:3.0.0
80+
image: registry:2.8.3
8481
environment:
8582
REGISTRY_HTTP_SECRET: ${REGISTRY_PULL_THROUGH_CACHE_HTTP_SECRET}
8683
# S3
@@ -103,9 +100,6 @@ services:
103100
# Logs
104101
REGISTRY_LOG_LEVEL: ${REGISTRY_PULL_THROUGH_CACHE_LOG_LEVEL}
105102
REGISTRY_LOG_ACCESSLOG_DISABLED: ${REGISTRY_PULL_THROUGH_CACHE_LOG_ACCESSLOG_DISABLED}
106-
# OpenTelemetry
107-
OTEL_EXPORTER_OTLP_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}:${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
108-
OTEL_SERVICE_NAME: registry-pull-through-cache
109103
ports:
110104
- mode: host
111105
target: 5000

services/registry/template.env

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,3 @@ REGISTRY_PULL_THROUGH_CACHE_LOG_ACCESSLOG_DISABLED=${REGISTRY_PULL_THROUGH_CACHE
3232

3333
DOCKER_HUB_LOGIN=${DOCKER_HUB_LOGIN}
3434
DOCKER_HUB_PASSWORD=${DOCKER_HUB_PASSWORD}
35-
36-
TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT=${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
37-
TRACING_OPENTELEMETRY_COLLECTOR_PORT=${TRACING_OPENTELEMETRY_COLLECTOR_PORT}

0 commit comments

Comments
 (0)