Show the root namespace "library" in the dropdown even when there are no repos in it

Allow reading password from file so that docker secrets can be used

CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Changelog
 
+### 0.7.3 (2018-08-14)
+
+* Add `registry_password_file` option to the config file.
+* Improve no data message on empty tables on UI.
+* Show the root namespace "library" in the dropdown even when there are no repos in it.
+* Switch alpine Docker image to 3.8.
+
 ### 0.7.2 (2018-07-30)
 
 * Make web root accessible w/o trailing slash when base_path is configured.

Dockerfile

@@ -18,7 +18,7 @@ RUN cd /opt/src/github.com/quiq/docker-registry-ui && \
     go build -o /opt/docker-registry-ui github.com/quiq/docker-registry-ui
 
 
-FROM alpine:3.7
+FROM alpine:3.8
 
 WORKDIR /opt
 RUN apk add --no-cache ca-certificates && \

config.yml

@@ -12,8 +12,11 @@ verify_tls: true
 # They need to have a full access to the registry.
 # If token authentication service is enabled, it will be auto-discovered and those credentials
 # will be used to obtain access tokens.
+# When the registry_password_file entry is used, the password can be passed as a docker secret 
+# and read from file. This overides the registry_password entry.
 registry_username: user
 registry_password: pass
+# registry_password_file: /run/secrets/registry_password_file
 
 # Event listener token.
 # The same one should be configured on Docker registry as Authorization Bearer token.

main.go

@@ -26,6 +26,7 @@ type configData struct {
 	VerifyTLS             bool     `yaml:"verify_tls"`
 	Username              string   `yaml:"registry_username"`
 	Password              string   `yaml:"registry_password"`
+	PasswordFile          string   `yaml:"registry_password_file"`
 	EventListenerToken    string   `yaml:"event_listener_token"`
 	EventRetentionDays    int      `yaml:"event_retention_days"`
 	EventDatabaseDriver   string   `yaml:"event_database_driver"`
@@ -86,6 +87,17 @@ func main() {
 			a.config.BasePath = a.config.BasePath[0 : len(a.config.BasePath)-1]
 		}
 	}
+	// Read password from file.
+	if a.config.PasswordFile != "" {
+		if _, err := os.Stat(a.config.PasswordFile); os.IsNotExist(err) {
+			panic(err)
+		}
+		passwordBytes, err := ioutil.ReadFile(a.config.PasswordFile)
+		if err != nil {
+			panic(err)
+		}
+		a.config.Password = strings.TrimSuffix(string(passwordBytes[:]), "\n")
+	}
 
 	// Init registry API client.
 	a.client = registry.NewClient(a.config.RegistryURL, a.config.VerifyTLS, a.config.Username, a.config.Password)

registry/client.go

@@ -148,6 +148,9 @@ func (c *Client) Namespaces() []string {
 	for k := range c.repos {
 		namespaces = append(namespaces, k)
 	}
+	if !ItemInSlice("library", namespaces) {
+		namespaces = append(namespaces, "library")
+	}
 	sort.Strings(namespaces)
 	return namespaces
 }

registry/common.go

@@ -42,3 +42,13 @@ func PrettySize(size float64) string {
 	}
 	return fmt.Sprintf("%.*f %s", 0, size, units[i])
 }
+
+// ItemInSlice check if item is an element of slice
+func ItemInSlice(item string, slice []string) bool {
+	for _, i := range slice {
+		if i == item {
+			return true
+		}
+	}
+	return false
+}

registry/common_test.go

@@ -45,3 +45,13 @@ func TestPrettySize(t *testing.T) {
 		}
 	})
 }
+
+func TestItemInSlice(t *testing.T) {
+	a := []string{"abc", "def", "ghi"}
+	convey.Convey("Check whether element is in slice", t, func() {
+		convey.So(ItemInSlice("abc", a), convey.ShouldBeTrue)
+		convey.So(ItemInSlice("ghi", a), convey.ShouldBeTrue)
+		convey.So(ItemInSlice("abc1", a), convey.ShouldBeFalse)
+		convey.So(ItemInSlice("gh", a), convey.ShouldBeFalse)
+	})
+}

template.go

@@ -39,6 +39,7 @@ func setupRenderer(debug bool, registryHost, basePath string) *Template {
 	view := jet.NewHTMLSet("templates")
 	view.SetDevelopmentMode(debug)
 
+	view.AddGlobal("version", version)
 	view.AddGlobal("basePath", basePath)
 	view.AddGlobal("registryHost", registryHost)
 	view.AddGlobal("pretty_size", func(size interface{}) string {

templates/base.html

@@ -22,8 +22,8 @@
             {{yield body()}}
 
             <div style="padding: 10px 0; margin-bottom: 20px">
-                <div style="float: left">
+                <div style="text-align: center; color:darkgrey">
-                    &copy; 2017-2018 <a href="https://goquiq.com">Quiq Inc.</a>
+                    Docker Registry UI v{{version}} &copy; 2017-2018 <a href="https://goquiq.com">Quiq Inc.</a>
                 </div>
             </div>
         </div>

templates/event_log.html

@@ -6,7 +6,10 @@
         $('#datatable').DataTable({
             "pageLength": 10,
             "order": [[ 4, 'desc' ]],
-            "stateSave": true
+            "stateSave": true,
+            "language": {
+                "emptyTable": "No events."
+            }
         });
     });
 </script>

templates/repositories.html

@@ -3,10 +3,6 @@
 {{block head()}}
 <script type="text/javascript">
     $(document).ready(function() {
-        $('#datatable').DataTable({
-            "pageLength": 25,
-            "stateSave": true
-        });
         $('#namespace').on('change', function (e) {
             window.location = '{{ basePath }}/' + this.value;
         });
@@ -18,6 +14,14 @@
             namespace = namespace.split('/')[1]
         }
         $('#namespace').val(namespace);
+
+        $('#datatable').DataTable({
+            "pageLength": 25,
+            "stateSave": true,
+            "language": {
+                "emptyTable": "No repositories in \"" + namespace + "\" namespace."
+            }
+        });
     });
 </script>
 {{end}}

templates/tags.html

@@ -11,7 +11,10 @@
             "stateSave": true,
             columnDefs: [
               { type: 'natural', targets: 0 }
-            ]
+            ],
+            "language": {
+                "emptyTable": "No tags in this repository."
+            }
         })
         function populateConfirmation()  {
             $('[data-toggle=confirmation]').confirmation({

version.go

@@ -0,0 +1,3 @@
+package main
+
+const version = "0.7.3"