Align Docker Compose resources with WSO2 Software License

wso2 · Mar 12, 2020 · 2e8471f · 2e8471f
1 parent 3eb1404
commit 2e8471f
Show file tree

Hide file tree

Showing 8 changed files with 91 additions and 307 deletions.
diff --git a/docker-compose/integrator-analytics/README.md b/docker-compose/integrator-analytics/README.md
@@ -4,51 +4,55 @@
 
 ## 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)
+ * 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 use Docker images with WSO2 updates, you need an active WSO2 subscription. If you do not possess an active WSO2
-   subscription, you can sign up for a WSO2 Free Trial Subscription from [here](https://wso2.com/free-trial-subscription).
-   Otherwise, you can proceed with Docker images which are created using GA releases.<br><br>
- * If you wish to run the Docker Compose configuration using Docker images built locally, build the Enterprise Integrator's Integrator, Analytics Dashboard and Analytics Worker
-   images using [EI Dockerfiles](../../dockerfiles) and remove the `docker.wso2.com/` prefix from the `image` name in the `docker-compose.yml`.
-   For example, change the line `image: docker.wso2.com/wso2ei-integrator:6.6.0` to <br> `image: wso2ei-integrator:6.6.0`. <br><br>
-
-## How to Run
-
-
-  1. Clone WSO2 Enterprise Integrator Docker git repository.
-
-     ```
-     git clone https://github.com/wso2/docker-ei
-     ```
-     > If you are to try out an already released zip of this repo, please ignore this 1st step. 
+ * In order to use Docker images with WSO2 updates, you need an active WSO2 subscription.
+   Otherwise, you can proceed with Docker images available at [DockerHub](https://hub.docker.com/u/wso2/), which are created using GA releases.<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>
 
-  2. Switch to the `docker-compose/integrator-analytics` folder.
-
-     ```
-     cd docker-ei/docker-compose/integrator-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-ei-<released-version>/docker-compose/integrator-analytics` folder. 
+## Quick Start Guide
+
+1. Login to WSO2's Private Docker Registry via Docker client. When prompted, enter the username and password of your WSO2 Subscription.
+
+   ```
+   docker login docker.wso2.com
+   ```
+
+2. Clone WSO2 API Management Docker and Docker Compose resource Git repository.
+
+   ```
+   git clone https://github.com/wso2/docker-ei
+   ```
+
+   > If you are to try out an already released zip of this repo, please ignore this 2nd step. 
+
+3. Switch to `docker-compose/integrator-analytics` folder.
+
+   ```
+   cd docker-ei/docker-compose/integrator-analytics
+   ```
+
+   > If you intend to try out an already released zip of this repository, extract the zip file and directly browse to
+   `docker-ei-<released-version-here>/docker-compose/integrator-analytics` folder. 
      
-     > If you are to try out an already released tag, after executing 2nd step, checkout the relevant tag, 
-     i.e. for example: <br> git checkout tags/v6.6.0.1 and continue below steps.
+   > If you intend to try out an already released tag, after executing 2nd step, checkout the relevant tag, 
+    i.e. for example: `git checkout tags/v6.6.0.1`, switch to `docker-compose/integrator-analytics` folder and continue with below steps.
 
-  3. [Optional] If you are using WSO2 product Docker images with WSO2 updates, replace the WSO2 product Docker image names
-    (relevant `image` attribute under each WSO2 product profile service) in the Docker Compose deployment definition.
-
-   **Note**: By default, each product profile service is configured to use WSO2 product Docker images with GA releases.
+4. Execute following Docker Compose command to start the deployment.
+
+   ```
+   docker-compose up
+   ```
+
+5. Access the WSO2 Enterprise Integrator web UIs using the below URLs via a web browser.
 
-  4. Execute following Docker Compose command to start the deployment.
-
-     ```
-     docker-compose up
-     ```
-       
-  5. Access management console via a web browser.
-
      ```
      For Integrator - https://localhost:9443/carbon
      For Analytics - https://localhost:9643/portal
      ```
+
+   Login to the web UIs using following credentials.
+
+   * Username: admin <br>
+   * Password: admin
diff --git a/docker-compose/integrator-analytics/docker-compose.yml b/docker-compose/integrator-analytics/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2.3'
 services:
   mysql:
-    image: mysql:5.7.20
+    image: mysql:5.7.28
     container_name: wso2ei-mysql
     ports:
       - 3306
@@ -14,7 +14,7 @@ services:
       timeout: 60s
       retries: 5
   wso2ei-analytics-worker:
-    image: wso2/wso2ei-analytics-worker:6.6.0
+    image: docker.wso2.com/wso2ei-analytics-worker:6.6.0
     container_name: wso2ei-analytics-worker
     ports:
       - 9091:9091
@@ -32,7 +32,7 @@ services:
       mysql:
         condition: service_healthy
   wso2ei-analytics-dashboard:
-    image: wso2/wso2ei-analytics-dashboard:6.6.0
+    image: docker.wso2.com/wso2ei-analytics-dashboard:6.6.0
     container_name: wso2ei-analytics-dashboard
     ports:
       - 9643:9643
@@ -48,7 +48,7 @@ services:
     volumes:
       - ./dashboard:/home/wso2carbon/wso2-config-volume
   wso2ei-integrator:
-    image: wso2/wso2ei-integrator:6.6.0
+    image: docker.wso2.com/wso2ei-integrator:6.6.0
     container_name: wso2ei-integrator
     ports:
       - 9443:9443

diff --git a/docker-compose/integrator-analytics/scripts/README.md b/docker-compose/integrator-analytics/scripts/README.md
diff --git a/docker-compose/integrator-analytics/scripts/deploy.sh b/docker-compose/integrator-analytics/scripts/deploy.sh
diff --git a/docker-compose/integrator-broker-analytics/README.md b/docker-compose/integrator-broker-analytics/README.md
@@ -6,44 +6,54 @@
 
  * 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 use Docker images with WSO2 updates, you need an active WSO2 subscription. If you do not possess an active WSO2
-   subscription, you can sign up for a WSO2 Free Trial Subscription from [here](https://wso2.com/free-trial-subscription).
-   Otherwise, you can proceed with Docker images which are created using GA releases.<br><br>
- * If you wish to run the Docker Compose configuration using Docker images built locally, build the Enterprise Integrator's Integrator, Message Broker, Analytics Dashboard and Analytics Worker
-   images using [EI Dockerfiles](../../dockerfiles) and remove the `docker.wso2.com/` prefix from the `image` name in the `docker-compose.yml`.
-   For example, change the line `image: docker.wso2.com/wso2ei-integrator:6.6.0` to <br> `image: wso2ei-integrator:6.6.0`. <br><br>
+ * In order to use Docker images with WSO2 updates, you need an active WSO2 subscription.
+   Otherwise, you can proceed with Docker images available at [DockerHub](https://hub.docker.com/u/wso2/), which are created using GA releases.<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>
+
+## Quick Start Guide
+
+1. Login to WSO2's Private Docker Registry via Docker client. When prompted, enter the username and password of your WSO2 Subscription.
+
+   ```
+   docker login docker.wso2.com
+   ```
+
+2. Clone WSO2 API Management Docker and Docker Compose resource Git repository.
+
+   ```
+   git clone https://github.com/wso2/docker-ei
+   ```
 
-## How to Run
+   > If you are to try out an already released zip of this repo, please ignore this 2nd step. 
 
-  1. Clone WSO2 Enterprise Integrator Docker git repository.
-     ```
-     git clone https://github.com/wso2/docker-ei
-     ```
-     > If you are to try out an already released zip of this repo, please ignore this 1st step.
+3. Switch to `docker-compose/integrator-broker-analytics` folder.
 
-  2. Switch to `docker-compose/integrator-broker-analytics` folder.
-     ```
-     cd [docker-ei]/docker-compose/integrator-broker-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-ei-<released-version>/docker-compose/integrator-broker-analytics` folder. 
+   ```
+   cd docker-ei/docker-compose/integrator-broker-analytics
+   ```
+
+   > If you intend to try out an already released zip of this repository, extract the zip file and directly browse to
+   `docker-ei-<released-version-here>/docker-compose/integrator-broker-analytics` folder. 
      
-     > If you are to try out an already released tag, after executing 2nd step, checkout the relevant tag, 
-     i.e. for example: <br> git checkout tags/v6.6.0.1 and continue below steps.
+   > If you intend to try out an already released tag, after executing 2nd step, checkout the relevant tag, 
+    i.e. for example: `git checkout tags/v6.6.0.1`, switch to `docker-compose/integrator-broker-analytics` folder and continue with below steps.
 
-  3. [Optional] If you are using WSO2 product Docker images with WSO2 updates, replace the WSO2 product Docker image names
-    (relevant `image` attribute under each WSO2 product profile service) in the Docker Compose deployment definition.
-
-   **Note**: By default, each product profile service is configured to use WSO2 product Docker images with GA releases.
+4. Execute following Docker Compose command to start the deployment.
 
-  4. Execute following Docker Compose command to start the deployment.
-     ```
-     docker-compose up
-     ```
+   ```
+   docker-compose up
+   ```
+
+5. Access the WSO2 Enterprise Integrator web UIs using the below URLs via a web browser.
 
-  4. Access management console via a web browser.
      ```
      For Integrator - https://localhost:9443/carbon
      For Analytics - https://localhost:9643/portal
      For Broker - https://localhost:9446/carbon
      ```
+
+   Login to the web UIs using following credentials.
+
+   * Username: admin <br>
+   * Password: admin
diff --git a/docker-compose/integrator-broker-analytics/docker-compose.yml b/docker-compose/integrator-broker-analytics/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2.3'
 services:
   mysql:
-    image: mysql:5.7.20
+    image: mysql:5.7.28
     container_name: wso2ei-mysql
     ports:
       - 3306
@@ -19,7 +19,7 @@ services:
       retries: 5
       start_period: 80s
   wso2ei-analytics-worker:
-    image: wso2/wso2ei-analytics-worker:6.6.0
+    image: docker.wso2.com/wso2ei-analytics-worker:6.6.0
     container_name: wso2ei-analytics-worker
     ports:
       - 9091:9091
@@ -37,7 +37,7 @@ services:
       mysql:
         condition: service_healthy
   wso2ei-analytics-dashboard:
-    image: wso2/wso2ei-analytics-dashboard:6.6.0
+    image: docker.wso2.com/wso2ei-analytics-dashboard:6.6.0
     container_name: wso2ei-analytics-dashboard
     ports:
       - 9643:9643
@@ -53,7 +53,7 @@ services:
     volumes:
       - ./dashboard:/home/wso2carbon/wso2-config-volume
   wso2ei-broker:
-    image: wso2/wso2ei-broker:6.6.0
+    image: docker.wso2.com/wso2ei-broker:6.6.0
     container_name: wso2ei-broker
     ports:
       - 9446:9446
@@ -79,7 +79,7 @@ services:
       wso2ei-analytics-dashboard:
         condition: service_healthy
   wso2ei-integrator:
-    image: wso2/wso2ei-integrator:6.6.0
+    image: docker.wso2.com/wso2ei-integrator:6.6.0
     container_name: wso2ei-integrator
     ports:
       - 9443:9443