Update master for 6.0.0 release (#348)

* Update for 6.0.0
* Address comments
* Remove centos

CHANGELOG.md

@@ -1,71 +1,22 @@
 # Changelog
 
-All notable changes to Docker and Docker Compose resources for WSO2 Identity and Management version `5.11.x`
+All notable changes to Docker and Docker Compose resources for WSO2 Identity and Management version `6.0.x`
 in each resource release, will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [v5.11.0.15] - 2022-06-20
+## v6.0.0.1 - 2022-08-15
 
 ### Changed
-- Update alpine base docker image version to 3.16
-
-## [v5.11.0.14] - 2022-06-09
-
-### Changed
-- Update mysql-connector-java version to 8.0.29
-
-## [v5.11.0.11] - 2022-03-08
-
-### Changed
-- Changed base image of dockerfiles to an OS image and installed relevant JDK on it, instead of using a JDK installed OS image. 
-
-## [v5.11.0.9] - 2022-01-20
-
-### Changed
-- Remove redundant jdk11 docker image directory.
-
-## [v5.11.0.8] - 2021-12-13
-
-### Changed
-- Add alpine, ubuntu and centos dockerfiles to dockerfiles directory for backward comfortability.  
-
-## [v5.11.0.6] - 2021-11-17
-
-### Changed
-- Change folder structure of dockerfile locations and introduced separate images for jdk8 and jdk11 (refer to [issue](https://github.com/wso2/docker-is/issues/306)
-
-
-## [v5.11.0.5] - 2021-08-16
-
-### Changed
-- Upgrade base docker image to fix the detected high security vulnerability. (refer to [issue](https://github.com/wso2/docker-is/issues/299)
-
-## [v5.11.0.3] - 2021.07.16
-
-### Changed
-
-- Update kubernetes common version.
-
-## [v5.11.0.2] - 2021.06.03
-
-### Changed
-
 - Update Docker OS base image.
 
-## [v5.11.0.1] - 2020.12.03
-
 ### Added
 
-- Docker resources of WSO2 Identity Server version `5.11.0` for Alpine, CentOS and Ubuntu (refer to [issue](https://github.com/wso2/docker-is/issues/238))
+- Docker resources of WSO2 Identity Server version `6.0.0` for Alpine and Ubuntu (refer to [issue](https://github.com/wso2/docker-is/issues/238))
 
 ### Removed
 
-- Avoid packaging MySQL JDBC Driver in Identity Server Docker images (refer to [issue](https://github.com/wso2/docker-is/issues/242))
+- JDK8 support
 
 For detailed information on the tasks carried out during this release, please see the GitHub milestone
-[v5.11.0.1](https://github.com/wso2/docker-is/milestone/22).
-
-[v5.11.0.1]: https://github.com/wso2/docker-is/compare/v5.10.0.3...v5.11.0.1
-[v5.11.0.2]: https://github.com/wso2/docker-is/compare/v5.11.0.1...v5.11.0.2
-[v5.11.0.3]: https://github.com/wso2/docker-is/compare/v5.11.0.2...v5.11.0.3
+[v6.0.0.1](https://github.com/wso2/docker-is/milestone/23).

CONTRIBUTING.md

@@ -24,20 +24,20 @@ The issues page on GitHub is for tracking bugs and feature requests. When posing
 If you like to contribute with a bug fix or a new feature, start by posting an issue and discussing the best way to implement it.
 
 Unlike most projects, development for this repository is carried out on the `5.11.x` branch. This is because the `master` branch contains the latest stable release of the project.
-The code in `5.11.x` is merged to the `master` branch after a final review and a round of testing.
+The code in `6.0.x` is merged to the `master` branch after a final review and a round of testing.
 
 Please follow these guidelines when contributing to the code:
 
 1. Fork the current repository.
-2. Create a topic branch from the `5.11.x` branch.
+2. Create a topic branch from the `6.0.x` branch.
 3. Make commits in logical units.
 4. Before you send out the pull request, sync your forked repository with a remote repository. This makes your pull request simple and clear.
 
 ```bash
 git clone https://github.com/<user>/docker-is.git
 git remote add upstream https://github.com/wso2/docker-is.git
 git fetch upstream
-git checkout -b <topic-branch> upstream/5.11.x
+git checkout -b <topic-branch> upstream/6.0.x
 
 # add some work
 

README.md

@@ -8,7 +8,7 @@ Use these artefacts as a reference to build your deployment artefacts. Existing
 
 This repository contains following Docker resources:
 
-- Per profile Docker resources of WSO2 Identity Server version `5.11.0` for Alpine, CentOS, Ubuntu
+- Per profile Docker resources of WSO2 Identity Server version `6.0.0` for Alpine and Ubuntu
 - Docker Compose resources to evaluate most common Identity And Access Management (IAM) deployment patterns
 
 Per profile Docker resources for WSO2 Identity Server help you build generic Docker images for deploying the

docker-compose/is/README.md

@@ -29,7 +29,7 @@
       Instead, extract the zip file and directly browse to `docker-is-<released-version-here>/docker-compose/is` 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.11.0.1 and continue below steps.
+      i.e. for example: git checkout tags/v6.0.0.1 and continue below steps.
 
   3. Execute following Docker Compose command to start the deployment.
   

docker-compose/is/conf/identity-server/repository/conf/deployment.toml

@@ -9,11 +9,7 @@ password = "admin"
 create_admin_account = true
 
 [user_store]
-type = "read_write_ldap_unique_id"
-connection_url = "ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}"
-connection_name = "uid=admin,ou=system"
-connection_password = "admin"
-base_dn = "dc=wso2,dc=org"      #refers the base dn on which the user and group search bases will be generated
+type = "database_unique_id"
 
 [database.identity_db]
 url = "jdbc:mysql://mysql:3306/WSO2IS_IDENTITY_DB?autoReconnect=true&useSSL=false"