move letsencrypt to /opt/shared

update dkregistry

dockerfiles/sslproxy/docker-compose.yml

@@ -5,8 +5,8 @@
 version: '3'
 services:
   app:
-    restart: always
-    image: "sslproxy:latest"
+#    restart: always
+    image: "dkregistry.xai-corp.net:5000/sslproxy:latest"
     build:
       context: .
       dockerfile: Dockerfile
@@ -14,7 +14,12 @@ services:
     volumes:
       - /etc/letsencrypt:/etc/letsencrypt:ro
     ports:
-       - "443:443"
+      - "443:443"
+
+#    logging:
+#      driver: gelf
+#      options:
+#        gelf-address: "udp://logs.xai-corp.net:12201"
 
     deploy:
       mode: replicated

dockerfiles/sslproxy/host.conf

@@ -78,6 +78,64 @@ server {
 
 }
 
+# dkregistry.xai-corp.net
+## Set a variable to help us decide if we need to add the
+## 'Docker-Distribution-Api-Version' header.
+## The registry always sets this header.
+## In the case of nginx performing auth, the header will be unset
+## since nginx is auth-ing before proxying.
+map $upstream_http_docker_distribution_api_version $docker_distribution_api_version {
+'' 'registry/2.0';
+}
+
+server {
+    listen  443 ssl;
+    server_name dkregistry.xai-corp.net;
+    ssl_certificate     /etc/letsencrypt/live/dkregistry.xai-corp.net/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/dkregistry.xai-corp.net/privkey.pem;
+
+    # Recommendations from https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html
+    ssl_protocols TLSv1.1 TLSv1.2;
+    ssl_ciphers 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH';
+    ssl_prefer_server_ciphers on;
+    ssl_session_cache shared:SSL:10m;
+
+    #Strict-Transport-Security: max-age=15768000
+    add_header Strict-Transport-Security "max-age=600; includeSubDomains" always;
+
+    # disable any limits to avoid HTTP 413 for large image uploads
+    client_max_body_size 0;
+
+    # required to avoid HTTP 411: see Issue #1486 (https://github.com/moby/moby/issues/1486)
+    chunked_transfer_encoding on;
+
+    location /v2/ {
+        # Do not allow connections from docker 1.5 and earlier
+        # docker pre-1.6.0 did not properly set the user agent on ping, catch "Go *" user agents
+        if ($http_user_agent ~ "^(docker\/1\.(3|4|5(?!\.[0-9]-dev))|Go ).*$" ) {
+        return 404;
+        }
+
+        # To add basic authentication to v2 use auth_basic setting.
+        auth_basic "Registry realm";
+        auth_basic_user_file /opt/shared/dkregistry/auth/htpasswd;
+
+        ## If $docker_distribution_api_version is empty, the header will not be added.
+        ## See the map directive above where this variable is defined.
+        add_header 'Docker-Distribution-Api-Version' $docker_distribution_api_version always;
+
+        proxy_set_header  Host              $http_host;   # required for docker client's sake
+        proxy_set_header  X-Real-IP         $remote_addr; # pass on real client's IP
+        proxy_set_header  X-Forwarded-For   $proxy_add_x_forwarded_for;
+        proxy_set_header  X-Forwarded-Proto $scheme;
+        proxy_set_header Connection $http_connection;
+
+        proxy_pass http://dkhost.xai-corp.net:5000;
+        proxy_read_timeout                  900;
+    }
+
+}
+
 # logs.xai-corp.net
 server {
     listen  443 ssl;
@@ -85,7 +143,7 @@ server {
     ssl_certificate     /etc/letsencrypt/live/logs.xai-corp.net/cert.pem;
     ssl_certificate_key /etc/letsencrypt/live/logs.xai-corp.net/privkey.pem;
     #Strict-Transport-Security: max-age=15768000
-    #add_header Strict-Transport-Security "max-age=600; includeSubDomains" always;
+    add_header Strict-Transport-Security "max-age=600; includeSubDomains" always;
 
     location / {
         proxy_set_header Connection $http_connection;