1 files changed, 21 insertions, 20 deletions
diff --git a/app/views/projects/container_registry/index.html.haml b/app/views/projects/container_registry/index.html.haml
index 1ac3a62f54e..5b7dd27ace6 100644
--- a/app/views/projects/container_registry/index.html.haml
+++ b/app/views/projects/container_registry/index.html.haml
@@ -1,35 +1,36 @@
 - page_title "Container Registry"
 = render "header_title"
 
-.light.prepend-top-default
-  %p
-    A 'container image' is a snapshot of a container.
-    You can host your 'container images' with GitLab.
-    %br
-    To start using container images hosted on GitLab you first need to login:
-    %pre
-      %code
-        docker login #{Gitlab.config.registry.host_port}
-    %br
-    Then you are free to create and upload a container images with build and push commands:
-    %pre
-      docker build -t #{Gitlab.config.registry.host_port}/#{@project.path_with_namespace} .
-      %br
-      docker push #{Gitlab.config.registry.host_port}/#{@project.path_with_namespace}
-
 %hr
 
 %ul.content-list
   - if @tags.blank?
     %li
-      .nothing-here-block No images to show
+      .nothing-here-block No images in Container Registry for this project.
+
+    .light.prepend-top-default
+      %p
+        A 'container image' is a snapshot of a container.
+        You can host your container images with GitLab.
+        %br
+        To start using container images hosted on GitLab you first need to login:
+        %pre
+          %code
+            docker login #{Gitlab.config.registry.host_port}
+        %br
+        Then you are free to create and upload a container images with build and push commands:
+        %pre
+          docker build -t #{escape_once(@project.container_registry_repository_url)} .
+          %br
+          docker push #{escape_once(@project.container_registry_repository_url)}
+
   - else
     .table-holder
       %table.table.builds
         %thead
           %tr
             %th Name
-            %th Digest
+            %th Image ID
             %th Size
             %th Created
             %th
@@ -37,8 +38,8 @@
         - @tags.each do |tag|
           %tr
             %td
-              #{tag.repository.name}:#{tag.name}
-              = clipboard_button(clipboard_text: "docker pull #{Gitlab.config.registry.host_port}/#{tag.repository.name}:#{tag.name}")
+              = escape_once(tag.name)
+              = clipboard_button(clipboard_text: "docker pull #{tag.path}")
             %td
               - if layer = tag.layers.first
                 %span.has-tooltip(title="#{layer.revision}")