Merge pull request #114 from wso2/5.7.x

Merge 5.7.x into master

.gitignore

@@ -21,4 +21,10 @@ hs_err_pid*
 *.iml
 
 rat.txt
+.DS_Store
+
+# exclude everything
 **/files/*
+
+# exception to the rule
+!**/files/.gitkeep

docker-compose/is-with-analytics/README.md

@@ -1,16 +1,15 @@
-# WSO2 Identity Server with Analytics
+# WSO2 Identity Server deployment with WSO2 Identity Server Analytics
 
 ![WSO2 Identity Server with Analytics](deployment-diagram.png)
 
-Runs a pre configured Identity Server container and Identity Server Analytics container.
-
 ## Prerequisites
 
  * Install [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git), [Docker](https://www.docker.com/get-docker) and [Docker Compose](https://docs.docker.com/compose/install/#install-compose)
    in order to run the steps provided in following Quick start guide. <br><br>
-  * In order to run this Docker Compose setup, you will need an active [Free Trial Subscription](https://wso2.com/free-trial-subscription) 
+ * In order to run this Docker Compose setup, you will need an active [Free Trial Subscription](https://wso2.com/free-trial-subscription) 
    from WSO2 since the referring Docker images hosted at docker.wso2.com contains the latest updates and fixes for WSO2 Identity Server. You can sign up for a Free Trial Subscription [here](https://wso2.com/free-trial-subscription). <br><br>
- * If you wish to run the Docker Compose setup using Docker images built locally, build Docker images using [Identity Server Dockerfile](../../dockerfiles/is/README.md), [Identity Server Analytics Dockerfile](../../dockerfiles/is-analytics/README.md) and remove the `docker.wso2.com/` prefix from the `image` name In the `docker-compose.yml`. <br><br>
+ * If you wish to run the Docker Compose setup using Docker images built locally, build Docker images using Docker resources available from [here](../../dockerfiles/) and remove the `docker.wso2.com/` prefix from the `image` name in the `docker-compose.yml`. <br><br>
+
 ## How to deploy
 
   1. Clone WSO2 Identity Server Docker git repository.
@@ -19,12 +18,12 @@ Runs a pre configured Identity Server container and Identity Server Analytics co
      ```
      > If you are to try out an already released zip of this repo, please ignore this 1st step.
 
-  2. Switch to the `docker-compose/is-analytics` folder.
+  2. Switch to the `docker-compose/is-with-analytics` folder.
      ```
      cd [docker-is]/docker-compose/is-with-analytics
      ```
      > If you are to try out an already released zip of this repo, please ignore this 2nd step also. 
-      Instead, extract the zip file and directly browse to `docker-is-<released-version-here>docker-compose/is-analytics` folder. 
+      Instead, extract the zip file and directly browse to `docker-is-<released-version-here>/docker-compose/is-with-analytics` folder. 
      
      > If you want to try out an already released tag, after executing 2nd step, checkout the relevant tag, 
       i.e. for example: git checkout tags/v5.4.1.4 and continue below steps.
@@ -40,7 +39,7 @@ Runs a pre configured Identity Server container and Identity Server Analytics co
      ```
   5. Access the Identity Server Analytics portal using the below URL via a web browser.
      ```
-     https://localhost:9444/portal/dashboards/IsAnalytics-AuthenticationData
+     https://localhost:9643/portal/
      ```
 
   6. When configuring an application with Identity Server, use the following properties

docker-compose/is-with-analytics/docker-compose.yml

@@ -13,38 +13,53 @@ services:
       interval: 30s
       timeout: 60s
       retries: 5
-  identity-server-analytics:
-    image: docker.wso2.com/wso2is-analytics:5.6.0
+  identity-server-analytics-worker:
+    image: docker.wso2.com/wso2is-analytics-worker:5.7.0
     ports:
+      - "9091:9091"
       - "9444:9444"
-      - "9764:9764"
     healthcheck:
-      test: ["CMD", "curl", "-k", "-f", "https://localhost:9444/carbon/admin/login.jsp"]
+      test: ["CMD", "nc", "-z","localhost", "9091"]
       interval: 10s
       timeout: 120s
       retries: 5
+      start_period: 100s
     depends_on:
       mysql:
         condition: service_healthy
     volumes:
-      - ./identity-server-analytics:/home/wso2carbon/wso2-server-volume
-    links:
-      - mysql
+      - ./identity-server-analytics-worker:/home/wso2carbon/wso2-config-volume
+  identity-server-analytics-dashboard:
+    image: docker.wso2.com/wso2is-analytics-dashboard:5.7.0
+    ports:
+      - "9643:9643"
+    healthcheck:
+      test: ["CMD", "nc", "-z","localhost", "9643"]
+      interval: 10s
+      timeout: 120s
+      retries: 5
+      start_period: 100s
+    depends_on:
+      mysql:
+        condition: service_healthy
+    volumes:
+      - ./identity-server-analytics-dashboard:/home/wso2carbon/wso2-config-volume
   identity-server:
-    image: docker.wso2.com/wso2is:5.6.0
+    image: docker.wso2.com/wso2is:5.7.0
     ports:
       - "9763:9763"
       - "9443:9443"
     healthcheck:
       test: ["CMD", "curl", "-k", "-f", "https://localhost:9443/carbon/admin/login.jsp"]
       interval: 5s
       timeout: 120s
-      start_period: 120s
+      start_period: 100s
     volumes:
-      - ./identity-server:/home/wso2carbon/wso2-server-volume
+      - ./identity-server:/home/wso2carbon/wso2-config-volume
     depends_on:
-      identity-server-analytics:
+      mysql:
+        condition: service_healthy
+      identity-server-analytics-worker:
+        condition: service_healthy
+      identity-server-analytics-dashboard:
         condition: service_healthy
-    links:
-        - mysql
-