fix(delete): update the message and wrap the delete function for onclick

Remove the Proxy header from default.conf

fixes #113

CONTRIBUTORS.md

@@ -12,7 +12,7 @@
 - Vladimir Kozyrev [@fieryvova](https://github.com/fieryvova)
 - Haibo Jia [@bluethon](https://github.com/bluethon)
 
-## Beceause committers are not the only contributors
+## Because committers are not the only contributors
 
 - Ewout Prangsma [@ewoutp](https://github.com/ewoutp)
 - [@soosap](https://github.com/soosap)
@@ -24,3 +24,5 @@
 - [@wuyue92tree](https://github.com/wuyue92tree)
 - Giovanni Toraldo [@gionn](https://github.com/gionn)
 - [@marcusblake](https://github.com/marcusblake)
+- Dario [@pidario](https://github.com/pidario)
+- Jernej K. [Cvetk0](https://github.com/Cvetk0)

README.md

@@ -61,6 +61,8 @@ This web user interface uses [Riot](https://github.com/Riot/riot) the react-like
     -   Yes you can, you must first configure your docker client. (see [#76](https://github.com/Joxit/docker-registry-ui/issues/76))
 -   What does Mixed Content error mean ?
     -   This means you are using a UI with HTTPS and your registry is using HTTP (unsecured). When you are on a HTTPS site, you can't get HTTP content. Upgrade you registry with a HTTPS connection.
+-   Why the default nginx `Host` is set to `$http_host` ?
+    -   This fixes the issue [#88](https://github.com/Joxit/docker-registry-ui/issues/88). More about this in [#113](https://github.com/Joxit/docker-registry-ui/issues/113).
 
 Need more informations ? Try my [examples](https://github.com/Joxit/docker-registry-ui/tree/master/examples) or open an issue.
 

arm32v7-static.dockerfile

@@ -18,6 +18,8 @@ LABEL maintainer="Jones MAGLOIRE @Joxit"
 
 WORKDIR /usr/share/nginx/html/
 
+ENV NGINX_PROXY_HEADER_Host '$http_host'
+
 COPY nginx/default.conf /etc/nginx/conf.d/default.conf
 COPY dist/ /usr/share/nginx/html/
 COPY dist/scripts/docker-registry-ui-static.js /usr/share/nginx/html/scripts/docker-registry-ui.js

arm64v8-static.dockerfile

@@ -18,6 +18,8 @@ LABEL maintainer="Jones MAGLOIRE @Joxit"
 
 WORKDIR /usr/share/nginx/html/
 
+ENV NGINX_PROXY_HEADER_Host '$http_host'
+
 COPY nginx/default.conf /etc/nginx/conf.d/default.conf
 COPY dist/ /usr/share/nginx/html/
 COPY dist/scripts/docker-registry-ui-static.js /usr/share/nginx/html/scripts/docker-registry-ui.js

debian-static.dockerfile

@@ -18,6 +18,8 @@ LABEL maintainer="Jones MAGLOIRE @Joxit"
 
 WORKDIR /usr/share/nginx/html/
 
+ENV NGINX_PROXY_HEADER_Host '$http_host'
+
 COPY nginx/default.conf /etc/nginx/conf.d/default.conf
 COPY dist/ /usr/share/nginx/html/
 COPY dist/scripts/docker-registry-ui-static.js /usr/share/nginx/html/scripts/docker-registry-ui.js

nginx/default.conf

@@ -24,7 +24,6 @@ server {
 #!        if ($http_user_agent ~ "^(docker\/1\.(3|4|5(?!\.[0-9]-dev))|Go ).*$" ) {
 #!            return 404;
 #!        }
-#!        proxy_set_header Host $http_host;
 #!        ${NGINX_PROXY_HEADERS}
 #!        proxy_pass ${REGISTRY_URL};
 #!    }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "docker-registry-ui",
-  "version": "1.4.0",
+  "version": "1.4.3",
   "scripts": {
     "build": "./node_modules/gulp/bin/gulp.js build"
   },

src/tags/app.tag

@@ -211,7 +211,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
         }
       });
       oReq.open('GET', registryUI.url() + '/v2/' + self.name + '/manifests/' + self.tag);
-      oReq.setRequestHeader('Accept', 'application/vnd.docker.distribution.manifest.v2+json');
+      oReq.setRequestHeader('Accept', 'application/vnd.docker.distribution.manifest.v2+json, application/vnd.oci.image.manifest.v1+json');
       oReq.send();
     };
 
@@ -239,7 +239,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
         }
       });
       oReq.open('GET', registryUI.url() + '/v2/' + self.name + '/blobs/' + blob);
-      oReq.setRequestHeader('Accept', 'application/vnd.docker.distribution.manifest.v2+json');
+      oReq.setRequestHeader('Accept', 'application/vnd.docker.distribution.manifest.v2+json, application/vnd.oci.image.manifest.v1+json');
       oReq.send();
     };
 

src/tags/remove-image.tag

@@ -29,8 +29,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
       if (self.multiDelete == self.opts.multiDelete) {
         return;
       }
-      if (this.tags['material-button']) {
-        this.delete = this.tags['material-button'].root.onclick = function(ignoreError) {
+      if (self.tags['material-button']) {
+        self.delete = function(ignoreError) {
           const name = self.opts.image.name;
           const tag = self.opts.image.tag;
           registryUI.taglist.go(name);
@@ -44,26 +44,29 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
               registryUI.taglist.display()
               registryUI.snackbar('Deleting ' + name + ':' + tag + ' image. Run `registry garbage-collect config.yml` on your registry');
             } else if (this.status == 404) {
-              ignoreError || registryUI.errorSnackbar('Digest not found');
+              ignoreError || registryUI.errorSnackbar('Digest not found for this image in your registry.');
             } else {
               registryUI.snackbar(this.responseText);
             }
           });
           oReq.open('DELETE', registryUI.url() + '/v2/' + name + '/manifests/' + self.digest);
-          oReq.setRequestHeader('Accept', 'application/vnd.docker.distribution.manifest.v2+json');
+          oReq.setRequestHeader('Accept', 'application/vnd.docker.distribution.manifest.v2+json, application/vnd.oci.image.manifest.v1+json');
           oReq.addEventListener('error', function() {
             registryUI.errorSnackbar('An error occurred when deleting image. Check if your server accept DELETE methods Access-Control-Allow-Methods: [\'DELETE\'].');
           });
           oReq.send();
         };
+        self.tags['material-button'].root.onclick = function() {
+          self.delete();
+        }
       }
 
-      if (this.tags['material-checkbox']) {
-        if (!this.opts.multiDelete && this.tags['material-checkbox'].checked) {
-          this.tags['material-checkbox'].toggle();
+      if (self.tags['material-checkbox']) {
+        if (!self.opts.multiDelete && self.tags['material-checkbox'].checked) {
+          self.tags['material-checkbox'].toggle();
         }
-        this.tags['material-checkbox'].on('toggle', function() {
-          registryUI.taglist.instance.trigger('toggle-remove-image', this.checked);
+        self.tags['material-checkbox'].on('toggle', function() {
+          registryUI.taglist.instance.trigger('toggle-remove-image', self.checked);
         });
       }
       self.multiDelete = self.opts.multiDelete;

static.dockerfile

@@ -30,6 +30,8 @@ LABEL maintainer="Jones MAGLOIRE @Joxit"
 
 WORKDIR /usr/share/nginx/html/
 
+ENV NGINX_PROXY_HEADER_Host '$http_host'
+
 COPY nginx/default.conf /etc/nginx/conf.d/default.conf
 COPY --from=builder /usr/app/dist/ /usr/share/nginx/html/
 COPY --from=builder /usr/app/dist/scripts/docker-registry-ui-static.js /usr/share/nginx/html/scripts/docker-registry-ui.js