Merge pull request #108 from nalakagunathilaka/docker-release-v2.0.0.2

Refactor 'obkm' to 'obiam', 'Key Manager' to 'Identity & Access Management Module' & Refine READMEs/CHANGELOG - 2

CHANGELOG.md

@@ -4,19 +4,27 @@ All notable changes to Docker and Docker Compose resources for WSO2 Open Banking
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [v2.0.0.2] - 2021-01-13
+
+### Fixed
+
+- Fix product name change of Open Banking Identity & Access Management Module in OB 2.0 release (refer to [issue](https://github.com/wso2/docker-open-banking/issues/103))
+
 ## [v2.0.0.1] - 2021-01-06
 
 ### Added
 
 - Open Banking UK and BERLIN specifications support	- Alpine and Ubuntu based Docker resources for WSO2 Open Banking API Manager `2.0.0`, WSO2 Open Banking Identity Server
-  as Key Manager version `2.0.0` and WSO2 Open Banking Business Intelligence Dashboard and Worker profiles `2.0.0`
+  as Identity & Access Management Module version `2.0.0` and WSO2 Open Banking Business Intelligence Dashboard and Worker profiles `2.0.0`
 - Upgrade profile based dockerfiles to use Adopt OpenJDK `jdk8u272-b10` as the base image
-- Docker Compose resources for OBAM, OBKM with OBBI deployment patterns
+- Docker Compose resources for OBAM, OBIAM with OBBI deployment patterns based on UK and Berlin specifications
+- Docker Compose resources for OBAM with OBIAM deployment patterns based on UK and AU specifications  
 - Solution is based on WSO2 APIM 3.1.0 and WSO2 ISKM 5.10.0  
-- Previous XML based configurations are carried out using TOML based configurations. Please refer the documentation for detailed mapping of configuration changes [Map Configurations](https://docs.wso2.com/display/OB200/Map+XML+Configurations+to+TOML+Configurations))
-- For detailed information of the WSO2 Open Banking 2.0.0 product release, please see the Github release notes [Releases](https://github.com/wso2-enterprise/financial-open-banking/releases))
+- Previous XML based configurations are carried out using TOML based configurations. Please refer the documentation for detailed mapping of configuration changes [Map Configurations](https://docs.wso2.com/display/OB200/Map+XML+Configurations+to+TOML+Configurations)
+- For detailed information of the WSO2 Open Banking 2.0.0 product release, please see the GitHub release notes [Releases](https://github.com/wso2-enterprise/financial-open-banking/releases)
 
 For detailed information on the tasks carried out during this release, please see the GitHub milestone [v2.0.0.1](https://github.com/wso2/docker-open-banking/milestone/11)
 
+[v2.0.0.2]: https://github.com/wso2/docker-open-banking/compare/v2.0.0.1...v2.0.0.2
 [v2.0.0.1]: https://github.com/wso2/docker-open-banking/compare/v1.5.0.2...v2.0.0.1
 

README.md

@@ -3,15 +3,15 @@
 This repository contains the following resources:
 
 - WSO2 Open Banking API Manager Dockerfile for Ubuntu and Alpine
-- WSO2 Open Banking Key Manager Dockerfile for Ubuntu and Alpine
+- WSO2 Open Banking Identity & Access Management Module Dockerfile for Ubuntu and Alpine
 - WSO2 Open Banking Business Intelligence Dockerfile for Ubuntu and Alpine
-- Docker Compose resources to evaluate WSO2 Open Banking API Manager with WSO2 Open Banking Key Manager profile based on UK, Berlin and AU specifications
-- Docker Compose resources to evaluate WSO2 Open Banking API Manager and WSO2 Open Banking Key Manager with WSO2 Open Banking Business Intelligence profiles based on UK and Berlin specifications
+- Docker Compose resources to evaluate WSO2 Open Banking API Manager with WSO2 Open Banking Identity & Access Management Module profile based on UK, Berlin and AU specifications
+- Docker Compose resources to evaluate WSO2 Open Banking API Manager and WSO2 Open Banking Identity & Access Management Module with WSO2 Open Banking Business Intelligence profiles based on UK, Berlin and AU specifications
 
-Docker resources for WSO2 Open Banking API Manager, WSO2 Open Banking Key Manager and WSO2 Open Banking Business Intelligence help you build generic Docker images for deploying the corresponding product servers in containerized environments. Each Docker image includes the JDK, the relevant product distribution and a collection of utility libraries. Configurations, custom JDBC
+Docker resources for WSO2 Open Banking API Manager, WSO2 Open Banking Identity & Access Management Module and WSO2 Open Banking Business Intelligence help you build generic Docker images for deploying the corresponding product servers in containerized environments. Each Docker image includes the JDK, the relevant product distribution and a collection of utility libraries. Configurations, custom JDBC
 drivers, extensions and other deployable artifacts are designed to be provided via volume mounts to the containers spawned.
 
-Docker Compose resources have been created according to the most common WSO2 Open Banking deployment profiles available for allowing users to quickly evaluate product features along side their co-operate Open Banking requirements. The Compose resources make use of Docker images of WSO2 Open Banking API Manager, WSO2 Open Banking Key Manager and MySQL.
+Docker Compose resources have been created according to the most common WSO2 Open Banking deployment profiles available for allowing users to quickly evaluate product features along side their co-operate Open Banking requirements. The Compose resources make use of Docker images of WSO2 Open Banking API Manager, WSO2 Open Banking Identity & Access Management Module and MySQL.
 
 **Change log** from previous `v1.5.0.2` release: [View Here](CHANGELOG.md)
 

docker-compose/obam-obkm-with-obbi/README.md → docker-compose/obam-obiam-with-obbi/README.md

@@ -1,4 +1,4 @@
-# WSO2 Open Banking API Manager and Open Banking Key Manager with Open Banking Business Intelligence
+# WSO2 Open Banking API Manager and Open Banking Identity & Access Management Module with Open Banking Business Intelligence
 
 
 ## Prerequisites
@@ -18,13 +18,13 @@
     ```
     > If you are to try out an already released zip of this repo, please ignore this 1st step. 
 
-2. Switch to the `docker-compose/obam-obkm-with-obbi` folder.
+2. Switch to the `docker-compose/obam-obiam-with-obbi` folder.
 
     ```
-    cd docker-open-banking/docker-compose/obam-obkm-with-obbi
+    cd docker-open-banking/docker-compose/obam-obiam-with-obbi
     ```
     > 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-open-banking-<released-version-here>/docker-compose/obam-obkm-with-obbi` folder. 
+     Instead, extract the zip file and directly browse to `docker-open-banking-<released-version-here>/docker-compose/obam-obiam-with-obbi` 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/v1.4.0.5 and continue below steps.
@@ -54,7 +54,7 @@
       https://localhost:8280
     ```
 
-  WSO2 Open Banking API Manager will use WSO2 Open Banking Key Manager to generate OAuth2 tokens and validate those tokens during API invocations. You can access the WSO2 Open Banking Key Manager-Management portal using the below URL via a web browser.
+  WSO2 Open Banking API Manager will use WSO2 Open Banking Identity & Access Management Module to generate OAuth2 tokens and validate those tokens during API invocations. You can access the WSO2 Open Banking Identity & Access Management Module-Management portal using the below URL via a web browser.
 
     ```
     https://localhost:9446/carbon

docker-compose/obam-obkm-with-obbi/docker-compose.yml → docker-compose/obam-obiam-with-obbi/docker-compose.yml

@@ -43,7 +43,7 @@ services:
 
   obbi-worker:
     container_name: obbi-worker
-    image: wso2-obbi-worker:2.0.0
+    image: docker.wso2.com/wso2-obbi-worker
     healthcheck:
       test: ["CMD", "nc", "-z", "localhost", "9445"]
       interval: 10s
@@ -70,7 +70,7 @@ services:
 
   obbi-dashboard:
     container_name: obbi-dashboard
-    image: wso2-obbi-dashboard:2.0.0
+    image: docker.wso2.com/wso2-obbi-dashboard
     healthcheck:
       test: ["CMD", "nc", "-z", "localhost", "9649"]
       interval: 10s
@@ -94,9 +94,9 @@ services:
       - "--"
       - "./docker-entrypoint.sh"
 
-  obkm:
+  obiam:
     container_name: obiam
-    image: wso2-obiam:2.0.0
+    image: docker.wso2.com/wso2-obiam
     healthcheck:
       test: ["CMD", "curl", "-k", "-f", "https://localhost:9446/carbon/admin/login.jsp"]
       interval: 10s
@@ -107,7 +107,7 @@ services:
       - "mysql"
       - "obbi-worker"
     volumes:
-      - "./obkm/uk:/home/wso2carbon/wso2-config-volume"
+      - "./obiam/uk:/home/wso2carbon/wso2-config-volume"
       - "./wait-for-it.sh:/home/wso2carbon/wait-for-it.sh"
     ports:
       - "9446:9446"
@@ -121,7 +121,7 @@ services:
 
   obam:
     container_name: obam
-    image: wso2-obam:2.0.0
+    image: docker.wso2.com/wso2-obam
     healthcheck:
       test: ["CMD", "curl", "-k", "-f", "https://localhost:9443/carbon/admin/login.jsp"]
       interval: 10s
@@ -130,7 +130,7 @@ services:
       retries: 5 
     depends_on:
       - "mysql"
-      - "obkm"
+      - "obiam"
       - "obbi-worker"
     volumes:
       - "./obam/uk:/home/wso2carbon/wso2-config-volume"
@@ -141,7 +141,7 @@ services:
       - "8280:8280"
     entrypoint:
       - "/home/wso2carbon/wait-for-it.sh"
-      - "obkm:9446"
+      - "obiam:9446"
       - "-t"
       - "240"
       - "--"