From ebcb13dded28ec6a3ec2fb66cb05468db5916d56 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Mon, 11 May 2020 18:34:43 +0200
Subject: [PATCH] Futher hacking into nowhere

---
 config.yml              | 16 +---------------
 docker-compose.prod.yml | 32 +++++++++++++++++++++-----------
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/config.yml b/config.yml
index 6d13dee..9b3ab9a 100644
--- a/config.yml
+++ b/config.yml
@@ -1,25 +1,11 @@
 ---
 version: 0.1
 
-log:
-  fields:
-    service: registry
-
 storage:
-  delete:
-    enabled: true
-  cache:
-    blobdescriptor: inmemory
   filesystem:
     rootdirectory: /var/lib/registry
 
 http:
   addr: :5000
   headers:
-    X-Content-Type-Options: [nosniff]
-    Access-Control-Allow-Origin: ["http://localhost"]
-    Access-Control-Allow-Methods: ["HEAD", "GET", "OPTIONS", "DELETE"]
-    Access-Control-Allow-Headers: ["Authorization"]
-    Access-Control-Max-Age: [1728000]
-    Access-Control-Allow-Credentials: [true]
-    Access-Control-Expose-Headers: ["Docker-Content-Digest"]
+    Access-Control-Allow-Origin: ["https://catalogue.swarm.autonomic.zone"]
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 5ab8243..6113349 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -6,12 +6,13 @@ services:
     image: "registry:2"
     ports:
       - "5000:5000"
-    environment:
-      - REGISTRY_STORAGE_DELETE_ENABLED=true
     volumes:
       - "registry:/var/lib/registry"
     networks:
-      - registry-ui-net
+      - proxy
+    configs:
+      - source: config-yml-prod-v1
+        target: /etc/docker/registry/config.yml
     deploy:
       mode: replicated
       replicas: 1
@@ -20,16 +21,22 @@ services:
       placement:
         constraints:
           - node.role == manager
+      labels:
+        - "traefik.enable=true"
+        - "traefik.http.services.registry.loadbalancer.server.port=5000"
+        - "traefik.http.routers.registry.rule=Host(`registry.swarm.autonomic.zone`)"
+        - "traefik.http.routers.registry.entrypoints=web-secure"
+        - "traefik.http.routers.registry.tls.certresolver=production"
 
   registry-ui:
-    image: "joxit/docker-registry-ui:static"
+    image: "joxit/docker-registry-ui:1.4"
     ports:
       - "3060:80"
     environment:
-      - URL=http://registry:5000
+      - REGISTRY_TITLE="Autonomic Container Catalogue"
+      - URL="https://registry.swarm.autonomic.zone"
     networks:
       - proxy
-      - registry-ui-net
     depends_on:
       - registry
     deploy:
@@ -42,15 +49,18 @@ services:
           - node.role == manager
       labels:
         - "traefik.enable=true"
-        - "traefik.http.services.registry.loadbalancer.server.port=80"
-        - "traefik.http.routers.registry.rule=Host(`registry.swarm.autonomic.zone`)"
-        - "traefik.http.routers.registry.entrypoints=web-secure"
-        - "traefik.http.routers.registry.tls.certresolver=production"
+        - "traefik.http.services.registry-ui.loadbalancer.server.port=80"
+        - "traefik.http.routers.registry-ui.rule=Host(`catalogue.swarm.autonomic.zone`)"
+        - "traefik.http.routers.registry-ui.entrypoints=web-secure"
+        - "traefik.http.routers.registry-ui.tls.certresolver=production"
 
 networks:
-  registry-ui-net:
   proxy:
     external: true
 
+configs:
+  config-yml-prod-v1:
+    file: config.yml
+
 volumes:
   registry: