Merge branch 'master' into develop

# Conflicts:
#	CHANGELOG.md

Author: lmarini

CHANGELOG.md

@@ -4,13 +4,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+
 ## Unreleased
 
 ### Added
 - Add endpoint and view page for the extractor metrics.
 - Add endpoint and view page to view a extractor's log from graylog.
 - Ignore the `update` field when posting to `/api/extractors`. [#89](https://github.com/clowder-framework/clowder/issues/89)
 
+## 1.11.2 - 2020-10-13
+
+### Fixed
+- Clowder healthcheck was not correct, resulting in docker-compose never thinking it was healthy. This could also result 
+  in traefik not setting up the routes.
+
 ## 1.11.1 - 2020-09-29
 
 ### Added

doc/src/sphinx/conf.py

@@ -22,7 +22,7 @@
 author = 'Luigi Marini'
 
 # The full version, including alpha/beta/rc tags
-release = '1.11.1'
+release = '1.11.2'
 
 
 # -- General configuration ---------------------------------------------------

docker/healthcheck.sh

@@ -3,4 +3,4 @@
 ### Add trailing backslash if not in context
 [[ "${CLOWDER_CONTEXT}" != */ ]] && CLOWDER_CONTEXT="${CLOWDER_CONTEXT}/"
 
-curl -s --fail http://localhost:8000${CLOWDER_CONTEXT:-/}api/status || exit 1
+curl -s --fail http://localhost:9000${CLOWDER_CONTEXT:-/}healthz || exit 1

project/Build.scala

@@ -13,7 +13,7 @@ import NativePackagerKeys._
 object ApplicationBuild extends Build {
 
   val appName = "clowder"
-  val version = "1.11.1"
+  val version = "1.11.2"
   val jvm = "1.7"
 
   def appVersion: String = {

public/swagger.yml

@@ -9,7 +9,7 @@ info:
     Clowder is a customizable and scalable data management system to support any
     data format and multiple research domains. It is under active development
     and deployed for a variety of research projects.
-  version: 1.11.1
+  version: 1.11.2
   termsOfService: https://clowder.ncsa.illinois.edu/clowder/tos
   contact:
     name: Clowder