Merge pull request #66 from atc-/0.8.4

0.8.4 merge

Author: Alex Collins

Dockerfile

@@ -9,3 +9,5 @@ RUN rm -rf /tomcat7/webapps/*
 VOLUME ["/var/lib/h2/", "/tomcat7"]
 
 ADD http://atc.gd/docker-registry-ui.war /tomcat7/webapps/ROOT.war
+
+CMD sed -i '1iexport CATALINA_OPTS=" -Djava.security.egd=file:/dev/./urandom "' bin/catalina.sh && bin/catalina.sh run

grails-app/conf/BootStrap.groovy

@@ -23,6 +23,11 @@ class BootStrap {
                     reg.url = urlStr.replaceAll("/(v\\d)/", "") // remove API version
                     reg.apiVersion = m.group(1) // extracts e.g. v1 from url
                     reg.save()
+
+                    if (!reg.ping()) {
+                        log.warn("Registry '${reg.toUrl()}' ping failed! Check it's up!")
+                    }
+
                 } else {
                     log.error("Couldn't parse the API version from $regUrl")
                 }

grails-app/conf/BuildConfig.groovy

@@ -70,6 +70,7 @@ grails.project.dependency.resolution = {
         compile ":jquery-ui:1.10.3"
         compile ":jquery-datatables:1.7.5"
         compile ":spring-security-core:2.0-RC3"
+        compile ":dwr:0.1"
 
         // plugins needed at runtime but not for compilation
         runtime ":hibernate4:4.3.5.3"

grails-app/conf/DwrConfigBootStrap.groovy

@@ -0,0 +1,16 @@
+class DwrConfigBootStrap {
+
+    def init = { servletContext -> }
+    def destroy = {}
+
+    def dwrconfig = {
+        service(name: 'registryService', javascript: 'RestService') {
+            exclude('setMetaClass,getMetaClass,setProperty,getProperty')
+        }
+
+        create(creator: 'new', javascript: 'AddressLookup') {
+            param(name: 'class') { 'uk.ltd.getahead.dwrdemo.address.AddressLookup' }
+        }
+    }
+}
+

grails-app/controllers/docker/registry/web/RegistryController.groovy

@@ -16,7 +16,8 @@ class RegistryController {
     }
 
     def show(Registry registryInstance) {
-        respond registryInstance
+        boolean isUp = registryInstance?.ping()
+        respond registryInstance, model: [registryIsUp: isUp]
     }
 
     def create() {

grails-app/domain/docker/registry/web/Registry.groovy

@@ -9,7 +9,7 @@ class Registry {
     static constraints = {
     }
 
-    static transients = ['toUrl', 'repositories']
+    static transients = ['toUrl', 'repositories', 'ping']
 
     def toUrl() {
         return "${this.url}/${this.apiVersion}"
@@ -19,6 +19,10 @@ class Registry {
         repositoryService.index(this)
     }
 
+    def ping() {
+        repositoryService.ping(this)
+    }
+
     @Override
     public String toString() {
         return "Registry{" +

grails-app/i18n/messages.properties

@@ -77,3 +77,6 @@ labels.registry.url=URL
 registry.apiVersion.label=API Version
 registry.url.label=URL
 ui.dialog.button.deleteTag=Delete tag
+registry.ping.failed=Ping failed\!
+registry.ping.succeeded=Ping succeeded
+labels.registry.ping=Pingable?

grails-app/i18n/messages_cs_CZ.properties

@@ -77,3 +77,6 @@ labels.registry.url=URL
 registry.apiVersion.label=API Version
 registry.url.label=URL
 ui.dialog.button.deleteTag=Delete tag
+registry.ping.failed=Ping failed\!
+registry.ping.succeeded=Ping succeeded
+labels.registry.ping=Pingable?

grails-app/i18n/messages_da.properties

@@ -77,4 +77,7 @@ labels.registry.url=URL
 registry.apiVersion.label=API Version
 registry.url.label=URL
 ui.dialog.button.deleteTag=Delete tag
+registry.ping.failed=Ping failed\!
+registry.ping.succeeded=Ping succeeded
+labels.registry.ping=Pingable?
 

grails-app/i18n/messages_de.properties

@@ -77,3 +77,6 @@ labels.registry.url=URL
 registry.apiVersion.label=API Version
 registry.url.label=URL
 ui.dialog.button.deleteTag=Delete tag
+registry.ping.failed=Ping failed\!
+registry.ping.succeeded=Ping succeeded
+labels.registry.ping=Pingable?