Merge pull request #66 from atc-/0.8.4

0.8.4 merge
atcol · Jul 26, 2014 · 8a11d41 · 8a11d41
2 parents 1c5ddae + 5ba7258
commit 8a11d41
Show file tree

Hide file tree

Showing 25 changed files with 115 additions and 5 deletions.
diff --git a/Dockerfile b/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
diff --git a/grails-app/conf/BootStrap.groovy b/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")
                 }

diff --git a/grails-app/conf/BuildConfig.groovy b/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"

diff --git a/grails-app/conf/DwrConfigBootStrap.groovy b/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' }
+        }
+    }
+}
+
diff --git a/grails-app/controllers/docker/registry/web/RegistryController.groovy b/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() {

diff --git a/grails-app/domain/docker/registry/web/Registry.groovy b/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{" +

diff --git a/grails-app/i18n/messages.properties b/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?
diff --git a/grails-app/i18n/messages_cs_CZ.properties b/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?
diff --git a/grails-app/i18n/messages_da.properties b/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?
 
diff --git a/grails-app/i18n/messages_de.properties b/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?
diff --git a/grails-app/i18n/messages_es.properties b/grails-app/i18n/messages_es.properties
@@ -76,4 +76,7 @@ labels.registry.apiVersion=API Version
 labels.registry.url=URL
 registry.apiVersion.label=API Version
 registry.url.label=URL
-ui.dialog.button.deleteTag=Delete tag
+ui.dialog.button.deleteTag=Delete tag
+registry.ping.failed=Ping failed\!
+registry.ping.succeeded=Ping succeeded
+labels.registry.ping=Pingable?
diff --git a/grails-app/i18n/messages_fr.properties b/grails-app/i18n/messages_fr.properties
@@ -41,3 +41,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?
diff --git a/grails-app/i18n/messages_it.properties b/grails-app/i18n/messages_it.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?
diff --git a/grails-app/i18n/messages_ja.properties b/grails-app/i18n/messages_ja.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?
diff --git a/grails-app/i18n/messages_nb.properties b/grails-app/i18n/messages_nb.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?
 
diff --git a/grails-app/i18n/messages_nl.properties b/grails-app/i18n/messages_nl.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?
diff --git a/grails-app/i18n/messages_pl.properties b/grails-app/i18n/messages_pl.properties
@@ -81,3 +81,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?
diff --git a/grails-app/i18n/messages_pt_BR.properties b/grails-app/i18n/messages_pt_BR.properties
@@ -80,4 +80,7 @@ labels.registry.apiVersion=API Version
 labels.registry.url=URL
 registry.apiVersion.label=API Version
 registry.url.label=URL
-ui.dialog.button.deleteTag=Delete tag
+ui.dialog.button.deleteTag=Delete tag
+registry.ping.failed=Ping failed\!
+registry.ping.succeeded=Ping succeeded
+labels.registry.ping=Pingable?
diff --git a/grails-app/i18n/messages_pt_PT.properties b/grails-app/i18n/messages_pt_PT.properties
@@ -56,3 +56,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?
diff --git a/grails-app/i18n/messages_ru.properties b/grails-app/i18n/messages_ru.properties
@@ -53,3 +53,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?
diff --git a/grails-app/i18n/messages_sv.properties b/grails-app/i18n/messages_sv.properties
@@ -76,4 +76,7 @@ labels.registry.apiVersion=API Version
 labels.registry.url=URL
 registry.apiVersion.label=API Version
 registry.url.label=URL
-ui.dialog.button.deleteTag=Delete tag
+ui.dialog.button.deleteTag=Delete tag
+registry.ping.failed=Ping failed\!
+registry.ping.succeeded=Ping succeeded
+labels.registry.ping=Pingable?
diff --git a/grails-app/i18n/messages_th.properties b/grails-app/i18n/messages_th.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?
diff --git a/grails-app/i18n/messages_zh_CN.properties b/grails-app/i18n/messages_zh_CN.properties
@@ -40,3 +40,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?
diff --git a/grails-app/services/docker/registry/web/RepositoryService.groovy b/grails-app/services/docker/registry/web/RepositoryService.groovy
@@ -118,4 +118,25 @@ class RepositoryService {
         "${url.host}${url.port != -1 ? ':' + url.port : ''}/${repoName}:${tag}"
     }
 
+    boolean ping(Registry registry) {
+        def url = "${registry.toUrl()}/_ping"
+        def http = new HTTPBuilder(url)
+        def result = true
+        try {
+            http.request(Method.GET, groovyx.net.http.ContentType.JSON) {
+                response.success = { resp, json ->
+                    log.info("Ping of $registry succeeded")
+                }
+
+                response.failure = { resp ->
+                    log.error("Failed to ping $url: ${resp.statusLine.statusCode} : ${resp.statusLine.reasonPhrase}")
+                    result = false
+                }
+            }
+        } catch (final ConnectException|IOException e) {
+            log.info("Ping failed: $e")
+            result = false
+        }
+        result
+    }
 }
diff --git a/grails-app/views/registry/show.gsp b/grails-app/views/registry/show.gsp
@@ -41,6 +41,15 @@
                                  value="${registryInstance?.url}" readonly=""></g:textField>
                 </div>
             </div>
+
+            <div class="form-group">
+                <label for="url" class="col-lg-2 control-label"><g:message code="labels.registry.ping"/> </label>
+
+                <div class="col-lg-4">
+                     ${registryIsUp ? message(code:"registry.ping.succeeded") : message(code:"registry.ping.failed")}
+                </div>
+            </div>
+
         </fieldset>
 
     </g:form>