From 47f9d4889933b7b2c3f3dd6184b7aa5232a1a2c8 Mon Sep 17 00:00:00 2001
From: giomba <giomba@linux.it>
Date: Thu, 29 Dec 2022 21:32:42 +0100
Subject: [PATCH] Decouple docker-compose and container credentials for
 Registry.

---
 registry/docker-compose.yml | 25 +++++++++---------
 registry/htpasswd           |  4 ---
 registry/registry.crt       | 36 -------------------------
 registry/registry.key       | 52 -------------------------------------
 4 files changed, 13 insertions(+), 104 deletions(-)
 delete mode 100644 registry/htpasswd
 delete mode 100644 registry/registry.crt
 delete mode 100644 registry/registry.key

diff --git a/registry/docker-compose.yml b/registry/docker-compose.yml
index 16fbb38..5f02e3f 100644
--- a/registry/docker-compose.yml
+++ b/registry/docker-compose.yml
@@ -15,17 +15,18 @@ services:
       - /srv/registry/data:/var/lib/registry
       - /srv/registry/certs:/certs
       - /srv/registry/auth:/auth
-  browser:
-    restart: unless-stopped
-    depends_on:
-      - registry
-    image: klausmeyer/docker-registry-browser
-    ports:
-      - "5001:8080"
-    environment:
-      DOCKER_REGISTRY_URL: https://registry:5000/
-      NO_SSL_VERIFICATION: "true"
-      BASIC_AUTH_USER: browser
-      BASIC_AUTH_PASSWORD: Z8kitWWfpsfj11HsXgNjtQ
+#  browser:
+#    restart: unless-stopped
+#    depends_on:
+#      - registry
+#    image: klausmeyer/docker-registry-browser
+#    ports:
+#      - "5001:8080"
+#    environment:
+#      DOCKER_REGISTRY_URL: https://registry:5000/
+#      NO_SSL_VERIFICATION: "true"
+#      BASIC_AUTH_USER: browser
+#      BASIC_AUTH_PASSWORD: ${REGISTRY_BROWSER_AUTH_PASSWORD}
+
 
 
diff --git a/registry/htpasswd b/registry/htpasswd
deleted file mode 100644
index c301924..0000000
--- a/registry/htpasswd
+++ /dev/null
@@ -1,4 +0,0 @@
-golem:$2y$05$rNWyfcyYTwvypKdzplPve.Ip.CA5.deA0GOEGpFxsejYqd3q.5BLG
-
-giomba:$2y$05$HIGY3JUl9NOImMS4Mv3yceCPTMjiZO2ZIfJmBOZxP1MEcD7kvTA2W
-
diff --git a/registry/registry.crt b/registry/registry.crt
deleted file mode 100644
index a35ff3e..0000000
--- a/registry/registry.crt
+++ /dev/null
@@ -1,36 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGMzCCBBugAwIBAgIUXYyZewh05ioE7FThv9monCJb4W4wDQYJKoZIhvcNAQEL
-BQAwgagxCzAJBgNVBAYTAklUMRAwDgYDVQQIDAdGaXJlbnplMQ8wDQYDVQQHDAZF
-bXBvbGkxLjAsBgNVBAoMJUdPTEVNIC0gR3J1cHBvIE9wZXJhdGl2byBMaW51eCBF
-bXBvbGkxIjAgBgNVBAMMGWh1Yi5kb2NrZXIuZ29sZW0ubGludXguaXQxIjAgBgkq
-hkiG9w0BCQEWE2luZm9AZ29sZW0ubGludXguaXQwHhcNMjAxMDI4MjA0ODAyWhcN
-MzAxMDI2MjA0ODAyWjCBqDELMAkGA1UEBhMCSVQxEDAOBgNVBAgMB0ZpcmVuemUx
-DzANBgNVBAcMBkVtcG9saTEuMCwGA1UECgwlR09MRU0gLSBHcnVwcG8gT3BlcmF0
-aXZvIExpbnV4IEVtcG9saTEiMCAGA1UEAwwZaHViLmRvY2tlci5nb2xlbS5saW51
-eC5pdDEiMCAGCSqGSIb3DQEJARYTaW5mb0Bnb2xlbS5saW51eC5pdDCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBALSZSg7SvO+cfgmFVPM4tE21+pP3mvNt
-/s231TjS/VA/n0omk7ynsJACvKp+kHzgqJ8FbJsOPysjJ18YmnMhFzyDvNDULazJ
-y7n/9gld+02SEjjMC+rcQoZpZwS+3U0R7y5XPJ1Og2J45zXYWLYkkocHRb7+FvQD
-olviKw6wWCAq0CrLP3Y4xwJYBGxiyfm3B2nz3fVJTS+oC33ZmaVWsjowwq+HwuL4
-4p7xdyVine4dC24rgRDGvGPt8c/f/CuXr11e6JMYX8vRxEeyemH8u2RKRG7NvTou
-SxaTzVSnYRPjrMCjAriVU/h3pH2S3g3gLm04wKid0Si5eiHG4+vSfgw6s/eRZOCg
-xXNPLuZWTphQpAgeAlbvhCiw5ho6dI0DA/xoIsUfQuKMLzhGxGp6ItM6ezFVuemk
-+oHr3bS9+uJcNwDTrF5b1Mc7/poGVKF1502WbJaN6ZfB1wUW6DEWYPMZz7u2tbYC
-ElkFBmubzVTJLu6xwHkVwU8S2aUfPFwktOJvmpjUciB6WTx/hgJpm24ws27g7+hw
-A9czdqQdiauOsjKfHed8PMDD6r+zdRfgi7hHsZsVIesU0mys0SuYo1Dmcsm8tZwH
-rKsZxbyIlwkiMKW1PYjhfmovOq4fMXd9V9Jvz6JN0m+ngGRmFpxViJ/WGnA1ic26
-m9fgmEAwatmdAgMBAAGjUzBRMB0GA1UdDgQWBBQObzsdet9Y+qXypttDKuaduF+9
-XTAfBgNVHSMEGDAWgBQObzsdet9Y+qXypttDKuaduF+9XTAPBgNVHRMBAf8EBTAD
-AQH/MA0GCSqGSIb3DQEBCwUAA4ICAQCC13si+1ew9Cmmrmw1Qn4CBaDvbjmFQLMx
-8pWLefhqngQRHpFhpQd3SnH3/XB+wynZjJWxr9nmEOrb0bSzXG9cD0cfddwvQr3D
-aT4r2guXi3s23AbayV2YkNynycqRT8mbfPcyyjX04BKuDu+gUNX88s6aIeryufw6
-7J834smpb7B7Kb6jjVgTLnivcf3353Vpc4f74Q2ZEIl1iWxjUySW9cfA4Rks7/wU
-MU034kyMQR6OAnOkm+45rdNWPHrwheZ2Z/rpTUgFqRKhNdu9hQX9YI8ydePyZdos
-Bm0xp7W7U7bQEz1hSAb7AcbYiMnxyhNFLd7wZv86mZNII3JCFTJ4wTBSAiquGrsL
-vLj+yXFAv7vm4s56i/IggjxltkiZrwX3pxS81XyBBe6DvqZ0jKvhIrT+z/gzFkdC
-f8HnREvZsP9hEsDVssQuI8Brjd5dCk1Bhz2K1vNHviRrABwxjuG4+KAfRlqLj7FV
-9TWrzn+kLE1DFHDsmtr5Ec1ORVXHeDbn7JX4UJapwzaQ8oAW2KnFgbc4+lnBeACB
-Zte7CLXGl5wrp1frdznsf3SBhNnL78dF6DscMmBO/KJ6SF5JD6zP1pY+U6qq0Ixl
-NGE7dTPFcZpdn2Eg9wsxbKBEeYW2pVH7UXI9zq8Nog8NgfK3OpjFNwyl5YSVN20y
-wVRibvmyZw==
------END CERTIFICATE-----
diff --git a/registry/registry.key b/registry/registry.key
deleted file mode 100644
index 0322fb9..0000000
--- a/registry/registry.key
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN PRIVATE KEY-----
-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
-jGabIx7FuMoybT9+JIdCs4dxaGZ5/lk=
------END PRIVATE KEY-----