Merge branch 'master' into master

.gitignore

@@ -21,7 +21,4 @@ hs_err_pid*
 *.iml
 
 rat.txt
-target/
-wso2*/scripts
-
-notes.txt
+**/files/*

README.md

@@ -1,31 +1,18 @@
-# WSO2 API Manager Docker Artifacts
+# Docker Resources for WSO2 API Manager 
 
 This repository contains following Docker artifacts, for trying out WSO2 API Manager on plain Docker:
 - WSO2 API Manager Dockerfile
-- WSO2 API Manager Docker Compose File
+- WSO2 API Manager Analytics Dockerfile
+- WSO2 API Manager Docker Compose Templates
 
-## Getting Started
+The WSO2 API Manager and API Manager Analytics Dockerfiles build generic Docker images <br>
+for deploying API Manager and API Manager Analytics in containerized environments. They<br>
+include the JDK, product distributions and a collection of utility libraries. Configurations, JDBC<br>
+driver, extensions and other deployable artifacts are designed to be provided via volume mounts.
 
-Execute following command to clone the repository:
+The Docker Compose templates have been created according to standard API Manager deployment patterns
+for allowing users to evaluate the product and understand the deployment architecture in depth.
 
-```bash
-git clone https://github.com/wso2/docker-apim.git
-```
-
-Checkout required product version branch:
-
-```bash
-git branch
-git checkout <product-version>
-```
-
-The bash files in dockerfile folder make use of scripts in [wso2/docker-common](https://github.com/wso2/docker-common) repository
-and it has been imported into dockerfile/common folder as a sub-module. Once the clone process is completed execute following 
-commands to pull the sub-module content:
-
-```bash
-git submodule init
-git submodule update
-```
 ## Note
-For running a containerized WSO2 API Manager deployment in production, its recommended to use a container cluster manager such as Kubernetes/Openshift. Please refer [APIM Kubernetes Artifacts](https://github.com/wso2/kubernetes-apim/) repository.
+For running a containerized WSO2 API Manager deployment in production, its recommended to use a<br>
+container cluster manager such as Kubernetes/Openshift. Please refer [APIM Kubernetes Artifacts](https://github.com/wso2/kubernetes-apim/) repository.

docker-compose/APIM-ISasKM-with-Analytics/README.md

@@ -0,0 +1,57 @@
+# WSO2 API Manager with Identity Server as Key Manager
+
+
+## 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) 
+ from WSO2 since the referring Docker images hosted at docker.wso2.com contains the latest updates and fixes for WSO2 API Manager <br>and
+ API Manager Analytics 2.2.0 and WSO2 Identity Server as KM 5.3.0. 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 <br> [WSO2 API Manager Dockerfile](../../dockerfiles/apim/README.md), [API Manager Analytics Dockerfile](../../dockerfiles/apim-analytics/README.md) and 
+ [WSO2 Identity Server as KM Dockerfile](../../dockerfiles/is-as-km/README.md) and remove the `docker.wso2.com/` prefix 
+ from the `image` name In the `docker-compose.yml`. For example, change the line <br> `image: docker.wso2.com/wso2am:2.2.0` to `image: wso2am:2.2.0` . <br><br>
+## Quick Start Guide
+
+1. Clone WSO2 API Manager Docker git repository.
+ ```
+ git clone https://github.com/wso2/docker-apim
+ ```
+  > If you are to try out an already released zip of this repo, please ignore this 1st step. 
+
+2. Switch to the `docker-compose/APIM-ISasKM-with-Analytics` folder.
+ ```
+ cd docker-apim/docker-compose/APIM-ISasKM-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-apim-<released-version-here>docker-compose/APIM-ISasKM-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/v2.1.0.4 and continue below steps.
+
+3. Execute the following Docker Compose command to start the deployment.
+ ```
+ docker-compose up
+ ```
+
+4. Once the deployment is started, try to access the web UIs via following URLs and default credentials <br> 
+ on your favorite web browser.
+
+ ```
+ https://localhost:9443/publisher
+ https://localhost:9443/store
+ https://localhost:9443/admin
+ https://localhost:9443/carbon
+ ```
+ Access the servers using following credentials.
+
+ * Username: admin <br>
+ * Password: admin
+
+ Please note that API Gateway will be available on following ports.
+ ```
+ https://localhost:8243
+ https://localhost:8280
+ ```
+
+ WSO2 API Manager will use WSO2 Identity Server to generate OAuth2 tokens and validate those tokens <br> during API invocations.

docker-compose/pattern-5/am-analytics/carbon/repository/conf/datasources/analytics-datasources.xml → docker-compose/APIM-ISasKM-with-Analytics/apim-analytics/repository/conf/datasources/analytics-datasources.xml

@@ -13,16 +13,18 @@
  <description>The datasource used for analytics record store</description>
  <definition type="RDBMS">
  <configuration>
- <url>jdbc:mysql://apim_rdbms:3306/stats_db?autoReconnect=true&amp;relaxAutoCommit=true</url>
+ <url>jdbc:mysql://mysql:3306/stats_db?autoReconnect=true&amp;relaxAutoCommit=true&amp;useSSL=false</url>
  <username>root</username>
  <password>root</password>
  <driverClassName>com.mysql.jdbc.Driver</driverClassName>
  <maxActive>50</maxActive>
  <maxWait>60000</maxWait>
- <testOnBorrow>true</testOnBorrow>
  <validationQuery>SELECT 1</validationQuery>
- <validationInterval>30000</validationInterval>
  <defaultAutoCommit>false</defaultAutoCommit>
+ <initialSize>0</initialSize>
+ <testWhileIdle>true</testWhileIdle>
+ <minEvictableIdleTimeMillis>4000</minEvictableIdleTimeMillis>
+ <defaultTransactionIsolation>READ_COMMITTED</defaultTransactionIsolation>
  </configuration>
  </definition>
  </datasource>
@@ -32,16 +34,18 @@
  <description>The datasource used for analytics record store</description>
  <definition type="RDBMS">
  <configuration>
- <url>jdbc:mysql://apim_rdbms:3306/stats_db?autoReconnect=true&amp;relaxAutoCommit=true</url>
+ <url>jdbc:mysql://mysql:3306/stats_db?autoReconnect=true&amp;relaxAutoCommit=true&amp;useSSL=false</url>
  <username>root</username>
  <password>root</password>
  <driverClassName>com.mysql.jdbc.Driver</driverClassName>
  <maxActive>50</maxActive>
  <maxWait>60000</maxWait>
- <testOnBorrow>true</testOnBorrow>
  <validationQuery>SELECT 1</validationQuery>
- <validationInterval>30000</validationInterval>
  <defaultAutoCommit>false</defaultAutoCommit>
+ <initialSize>0</initialSize>
+ <testWhileIdle>true</testWhileIdle>
+ <minEvictableIdleTimeMillis>4000</minEvictableIdleTimeMillis>
+ <defaultTransactionIsolation>READ_COMMITTED</defaultTransactionIsolation>
  </configuration>
  </definition>
  </datasource>

docker-compose/pattern-4/am-analytics/carbon/repository/conf/datasources/stats-datasources.xml → docker-compose/APIM-ISasKM-with-Analytics/apim-analytics/repository/conf/datasources/stats-datasources.xml

@@ -13,7 +13,7 @@
  </jndiConfig>
  <definition type="RDBMS">
  <configuration>
- <url>jdbc:mysql://apim_rdbms:3306/stats_db?autoReconnect=true&amp;relaxAutoCommit=true</url>
+ <url>jdbc:mysql://mysql:3306/stats_db?autoReconnect=true&amp;relaxAutoCommit=true&amp;useSSL=false</url>
  <username>root</username>
  <password>root</password>
  <driverClassName>com.mysql.jdbc.Driver</driverClassName>

docker-compose/pattern-1/api-manager/carbon/bin/wso2server.sh → docker-compose/APIM-ISasKM-with-Analytics/apim/bin/wso2server.sh

@@ -314,6 +314,7 @@ do
  -Dcom.ibm.cacheLocalHost=true \
  -Dorg.opensaml.httpclient.https.disableHostnameVerification=true \
  -Dorg.wso2.ignoreHostnameVerification=true \
+ -Dhttpclient.hostnameVerifier="AllowAll" \
  -DworkerNode=false \
  org.wso2.carbon.bootstrap.Bootstrap $*
  status=$?