Update master for 7.0.0 release

CHANGELOG.md

@@ -1,32 +1,27 @@
 # Changelog
 
-All notable changes to Docker and Docker Compose resources for WSO2 Identity and Management version `6.1.x`
+All notable changes to Docker and Docker Compose resources for WSO2 Identity and Management version `7.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/).
 
-## v6.1.0.3 - 2023-10-19
+## v7.0.0.4 - 2024-12-18
 
 ### Changed
-- Update jdk-11.0.19+7 to jdk-11.0.20.1+1.
+- Update alpine version 3.16 to 3.20.3
 
-## v6.1.0.2 - 2023-06-27
-
-### Changed
-- Update jdk-11.0.18+10 to jdk-11.0.19+7.
-
-## v6.1.0.1 - 2023-02-01
+## v7.0.0.1 - 2024-03-04
 
 ### Changed
 - Update Docker OS base image.
 
 ### Added
 
-- Docker resources of WSO2 Identity Server version `6.1.0` for Alpine and Ubuntu (refer to [issue](https://github.com/wso2/docker-is/issues/238))
+- Docker resources of WSO2 Identity Server version `7.0.0` for Alpine and Ubuntu (refer to [issue](https://github.com/wso2/docker-is/issues/238))
 
 ### Removed
 
 - JDK8 support
 
 For detailed information on the tasks carried out during this release, please see the GitHub milestone
-[v6.1.0.1](https://github.com/wso2/docker-is/milestone/24).
+[v7.0.0.1](https://github.com/wso2/docker-is/milestone/25).

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 `6.1.x` is merged to the `master` branch after a final review and a round of testing.
+The code in `7.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 `6.1.x` branch.
+2. Create a topic branch from the `7.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/6.1.x
+git checkout -b <topic-branch> upstream/7.0.x
 
 # add some work
 

README.md

@@ -8,13 +8,13 @@ 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 `6.1.0` for Alpine and Ubuntu
+- Per profile Docker resources of WSO2 Identity Server version `7.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
 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 other than the default MySQL JDBC driver provided,
-extensions and other deployable artifacts are designed to be provided via volume mounts to the containers spawned.
+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 IAM deployment patterns available for allowing users
 to quickly evaluate product features along side their co-operate IAM requirements. The Compose files make use of per profile

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/v6.1.0.1 and continue below steps.
+      i.e. for example: git checkout tags/v7.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

@@ -30,3 +30,15 @@ validationQuery="SELECT 1"
 [keystore.primary]
 file_name = "wso2carbon.jks"
 password = "wso2carbon"
+type="JKS"
+
+[truststore]
+file_name="client-truststore.jks"
+password="wso2carbon"
+type="JKS"
+
+[account_recovery.endpoint.auth]
+hash= "66cd9688a2ae068244ea01e70f0e230f5623b7fa4cdecb65070a09ec06452262"
+
+[identity.auth_framework.endpoint]
+app_password= "dashboard"