From c7e9c53eb75044d2e592d3f9fbbe6675d0dc0790 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Mon, 11 May 2020 17:25:43 +0200
Subject: [PATCH] More hacking on static config

---
 config.yml              | 25 +++++++++++++++++++++++++
 docker-compose.prod.yml | 21 ++++++++++++++-------
 docker-compose.yml      |  4 ++--
 3 files changed, 41 insertions(+), 9 deletions(-)
 create mode 100644 config.yml

diff --git a/config.yml b/config.yml
new file mode 100644
index 0000000..6d13dee
--- /dev/null
+++ b/config.yml
@@ -0,0 +1,25 @@
+---
+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"]
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 5890bce..a3fde38 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -6,8 +6,13 @@ services:
     image: "registry:2"
     ports:
       - "5000:5000"
+    environment:
+      - REGISTRY_STORAGE_DELETE_ENABLED=true
     volumes:
       - "registry:/var/lib/registry"
+    configs:
+      - source: config-yml-prod-v1
+        target: /etc/docker/registry/config.yml
     networks:
       - proxy
     deploy:
@@ -18,20 +23,18 @@ services:
       placement:
         constraints:
           - node.role == manager
-      labels:
-        - "traefik.enable=true"
-        - "traefik.http.services.registry.loadbalancer.server.port=5000"
 
   registry-ui:
-    image: "joxit/docker-registry-ui:1.4"
+    image: "joxit/docker-registry-ui:static"
     ports:
       - "3060:80"
     environment:
-      - REGISTRY_URL=http://registry:5000
-      - REGISTRY_TITLE=registry.swarm.autonomic.zone
-      - DELETE_IMAGES=true
+      - URL=http://registry:5000
+      - REGISTRY_TITLE="Autonomic Container Catalogue"
     networks:
       - proxy
+    depends_on:
+      - registry
     deploy:
       mode: replicated
       replicas: 1
@@ -51,5 +54,9 @@ networks:
   proxy:
     external: true
 
+configs:
+  config-yml-prod-v1:
+    file: config.yml
+
 volumes:
   registry:
diff --git a/docker-compose.yml b/docker-compose.yml
index e8ddb30..d51ec4d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,11 +10,11 @@ services:
       - "registry:/var/lib/registry"
 
   registry-ui:
-    image: "joxit/docker-registry-ui:1.4"
+    image: "joxit/docker-registry-ui:static"
     ports:
       - "80:80"
     environment:
-      - REGISTRY_URL=http://registry:5000
+      - URL=http://registry:5000
 
 volumes:
   registry: