diff --git a/CHANGELOG.md b/CHANGELOG.md index 91616e06..1067a384 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,13 @@ # Changelog -All notable changes to Docker and Docker Compose resources for WSO2 API Management version `4.1.x` in each resource release, will be documented in this file. +All notable changes to Docker and Docker Compose resources for WSO2 API Management version `4.2.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/). -## [v4.1.0.0] - 2022-03-23 +## [v4.2.0.1] - 2023-03-21 ### Changed -- Update all Docker resources to support WSO2 API Manager version `4.1.0`. -- Update all Docker Compose resources to supprt WSO2 API Manager version `4.1.0`. -- Update Docker Compose resources for the deployment of WSO2 APIM with MI to support Micro Integrator version `4.1.0.0`. +- Update all Docker resources to support WSO2 API Manager version `4.2.0`. +- Update all Docker Compose resources to supprt WSO2 API Manager version `4.2.0`. +- Update Docker Compose resources for the deployment of WSO2 APIM with MI to support Micro Integrator version `4.2.0.1`. - Update IS extentions to the [latest version](https://repo1.maven.org/maven2/org/wso2/km/ext/wso2is/distribution/1.4.2/) `1.4.2` and mount wso2carbon and client-truststore keystores with the latest wso2carbon certificate in Identity Server as Key Manager with Choreo Analytics deployment setup. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c992c96b..e984b25d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,13 +23,13 @@ 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 `4.0.x` branch. This is because the `master` branch contains the latest stable release of the project. -The code in `4.0.x` is merged to the `master` branch after a final review and a round of testing. +Unlike most projects, development for this repository is carried out on the `4.2.x` branch. This is because the `master` branch contains the latest stable release of the project. +The code in `4.2.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 `4.0.x` branch. +2. Create a topic branch from the `4.2.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. @@ -37,7 +37,7 @@ Please follow these guidelines when contributing to the code: git clone https://github.com//docker-apim.git git remote add upstream https://github.com/wso2/docker-apim.git git fetch upstream -git checkout -b upstream/4.0.x +git checkout -b upstream/4.2.x # add some work diff --git a/README.md b/README.md index 49667d5c..35c3af86 100644 --- a/README.md +++ b/README.md @@ -19,4 +19,4 @@ Docker Compose files have been created according to the most common API Manageme to quickly evaluate product features along side their co-operate API Management requirements. The Compose files make use of per profile Docker images of WSO2 API Manager, WSO2 Identity Server as Key Manager, and Micro Integrator as well as MySQL. -**Change log** from previous v4.0.0.4 release: [View Here](https://github.com/wso2/docker-apim/blob/4.0.x/CHANGELOG.md) +**Change log** from previous v4.1.0.2 release: [View Here](https://github.com/wso2/docker-apim/blob/4.1.x/CHANGELOG.md) diff --git a/docker-compose/apim-is-as-km-with-analytics/README.md b/docker-compose/apim-is-as-km-with-analytics/README.md index 20610997..fb5fe12d 100755 --- a/docker-compose/apim-is-as-km-with-analytics/README.md +++ b/docker-compose/apim-is-as-km-with-analytics/README.md @@ -5,10 +5,8 @@ * 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.

* 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.

- * 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`.

-* If you don't have a valid WSO2 Subscription, you can replace the images in [dockerfiles](../apim-is-as-km-with-analytics/dockerfiles/) with the [public image](https://hub.docker.com/repository/docker/wso2/wso2am) (`wso2/wso2am:4.1.0`).

-* If you are trying this out on Apple Silicon (with M1), use the public image that supports arm64 architecture (`wso2/wso2am:4.1.0-multiarch`).

+ If you don't have a valid WSO2 Subscription, you need to build Docker images by source. Build Docker images using Docker resources available in [here](../../dockerfiles/) and replace the `docker.wso2.com/` prefix from the `image` name in the `docker-compose.yml`.

+* If you are trying this out on Apple Silicon (with M1), build images that supports arm64 architecture according to the instructions in [README](../../dockerfiles/ubuntu/apim/README.md).

## Quick Start Guide @@ -35,7 +33,7 @@ `docker-apim-/docker-compose/apim-is-as-km-with-analytics` folder. > 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/v4.2.0.0`, switch to `docker-compose/apim-is-as-km-with-analytics` folder and continue with below steps. + i.e. for example: `git checkout tags/v4.2.0.1`, switch to `docker-compose/apim-is-as-km-with-analytics` folder and continue with below steps. 4. [Optional] Replace the existing IS extensions with the latest. diff --git a/docker-compose/apim-is-as-km-with-analytics/dockerfiles/apim/Dockerfile b/docker-compose/apim-is-as-km-with-analytics/dockerfiles/apim/Dockerfile index 04cf7373..cb1b2a20 100644 --- a/docker-compose/apim-is-as-km-with-analytics/dockerfiles/apim/Dockerfile +++ b/docker-compose/apim-is-as-km-with-analytics/dockerfiles/apim/Dockerfile @@ -18,7 +18,7 @@ # set base Docker image to WSO2 API Manager Docker image with latest WSO2 Updates -FROM wso2am:4.2.0 +FROM docker.wso2.com/wso2am:4.2.0.0 LABEL maintainer="WSO2 Docker Maintainers " diff --git a/docker-compose/apim-with-analytics/README.md b/docker-compose/apim-with-analytics/README.md index 7729f8e1..a2af36e3 100755 --- a/docker-compose/apim-with-analytics/README.md +++ b/docker-compose/apim-with-analytics/README.md @@ -5,11 +5,8 @@ * 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.

* 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.

- * 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 base image (i.e. `FROM` instruction) in the [Dockerfiles](dockerfiles).

-* If you don't have a valid WSO2 Subscription, you can replace the images in [dockerfiles](../apim-with-analytics/dockerfiles/) with the [public image](https://hub.docker.com/repository/docker/wso2/wso2am) (`wso2/wso2am:4.1.0`).

-* If you are trying this out on Apple Silicon (with M1), use the public image that supports arm64 architecture (`wso2/wso2am:4.1.0-multiarch`).

+ If you don't have a valid WSO2 Subscription, you need to build Docker images by source. Build Docker images using Docker resources available in [here](../../dockerfiles/) and replace the `docker.wso2.com/` prefix from the `image` name in the `docker-compose.yml`.

+* If you are trying this out on Apple Silicon (with M1), build images that supports arm64 architecture according to the instructions in [README](../../dockerfiles/ubuntu/apim/README.md).

## Quick Start Guide @@ -36,7 +33,7 @@ `docker-apim-/docker-compose/apim-with-analytics` folder. > 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/v4.2.0.0`, switch to `docker-compose/apim-with-analytics` folder and continue with below steps. + i.e. for example: `git checkout tags/v4.2.0.1`, switch to `docker-compose/apim-with-analytics` folder and continue with below steps. 4. WSO2 no longer provides an on-premise Analytics solution. In order to connect WSO2 API Manager to [Choreo Analytics](https://analytics.choreo.dev/), obtain an `on-prem-key` by following the steps in the [documentation](https://apim.docs.wso2.com/en/4.2.0/observe/api-manager-analytics/configure-analytics/register-for-analytics/). diff --git a/docker-compose/apim-with-analytics/dockerfiles/apim/Dockerfile b/docker-compose/apim-with-analytics/dockerfiles/apim/Dockerfile index 7f631e79..8926a26f 100644 --- a/docker-compose/apim-with-analytics/dockerfiles/apim/Dockerfile +++ b/docker-compose/apim-with-analytics/dockerfiles/apim/Dockerfile @@ -17,7 +17,7 @@ # ------------------------------------------------------------------------ # set base Docker image to WSO2 API Manager Docker image with latest WSO2 Updates -FROM wso2am:4.2.0 +FROM docker.wso2.com/wso2am:4.2.0.0 LABEL maintainer="WSO2 Docker Maintainers " # build arguments for external artifacts diff --git a/docker-compose/apim-with-mi/README.md b/docker-compose/apim-with-mi/README.md index 76b7f9ab..d92843ff 100644 --- a/docker-compose/apim-with-mi/README.md +++ b/docker-compose/apim-with-mi/README.md @@ -5,10 +5,8 @@ * 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.

* 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.

- * 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`.

-* If you don't have a valid WSO2 Subscription, you can replace the images in [dockerfiles](../apim-with-mi/dockerfiles/) with the [public image](https://hub.docker.com/repository/docker/wso2/wso2am) (`wso2/wso2am:4.1.0`).

-* If you are trying this out on Apple Silicon (with M1), use the public image that supports arm64 architecture (`wso2/wso2am:4.1.0-multiarch`).

+ If you don't have a valid WSO2 Subscription, you need to build Docker images by source. Build Docker images using Docker resources available in [here](../../dockerfiles/) and replace the `docker.wso2.com/` prefix from the `image` name in the `docker-compose.yml`.

+* If you are trying this out on Apple Silicon (with M1), build images that supports arm64 architecture according to the instructions in [README](../../dockerfiles/ubuntu/apim/README.md).

## Quick Start Guide @@ -35,7 +33,7 @@ `docker-apim-/docker-compose/apim-with-mi` folder. > 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/v4.2.0.0`, switch to `docker-compose/apim-with-mi` folder and continue with below steps. + i.e. for example: `git checkout tags/v4.2.0.1`, switch to `docker-compose/apim-with-mi` folder and continue with below steps. 4. Add deployable `CAR` files diff --git a/docker-compose/apim-with-mi/dockerfiles/apim/Dockerfile b/docker-compose/apim-with-mi/dockerfiles/apim/Dockerfile index 2c25deb5..75d04091 100644 --- a/docker-compose/apim-with-mi/dockerfiles/apim/Dockerfile +++ b/docker-compose/apim-with-mi/dockerfiles/apim/Dockerfile @@ -17,7 +17,7 @@ # ------------------------------------------------------------------------ # set base Docker image to WSO2 API Manager Docker image with latest WSO2 Updates -FROM wso2am:4.2.0 +FROM docker.wso2.com/wso2am:4.2.0.0 LABEL maintainer="WSO2 Docker Maintainers " # build arguments for external artifacts diff --git a/docker-compose/apim-with-mi/dockerfiles/mi/Dockerfile b/docker-compose/apim-with-mi/dockerfiles/mi/Dockerfile index af54e718..231c043a 100644 --- a/docker-compose/apim-with-mi/dockerfiles/mi/Dockerfile +++ b/docker-compose/apim-with-mi/dockerfiles/mi/Dockerfile @@ -16,7 +16,7 @@ # # ------------------------------------------------------------------------ -FROM wso2mi:4.2.0 +FROM docker.wso2.com/wso2mi:4.2.0.0 LABEL maintainer="WSO2 Docker Maintainers " # copy CAR files to the MI server home diff --git a/dockerfiles/alpine/apim/Dockerfile b/dockerfiles/alpine/apim/Dockerfile index 83534b38..29b79edd 100755 --- a/dockerfiles/alpine/apim/Dockerfile +++ b/dockerfiles/alpine/apim/Dockerfile @@ -55,7 +55,7 @@ ENV JAVA_HOME=/opt/java/openjdk \ PATH="/opt/java/openjdk/bin:$PATH" LABEL maintainer="WSO2 Docker Maintainers " \ - com.wso2.docker.source="https://github.com/wso2/docker-apim/releases/tag/v4.2.0.0" + com.wso2.docker.source="https://github.com/wso2/docker-apim/releases/tag/v4.2.0.1" # set Docker image build arguments # build arguments for user/group configurations @@ -66,11 +66,11 @@ ARG USER_GROUP_ID=802 ARG USER_HOME=/home/${USER} # build arguments for WSO2 product installation ARG WSO2_SERVER_NAME=wso2am -ARG WSO2_SERVER_VERSION=4.2.0-rc +ARG WSO2_SERVER_VERSION=4.2.0 ARG WSO2_SERVER_REPOSITORY=product-apim ARG WSO2_SERVER=${WSO2_SERVER_NAME}-${WSO2_SERVER_VERSION} -ARG WSO2_SERVER_HOME=${USER_HOME}/wso2am-4.2.0 -ARG WSO2_SERVER_DIST_URL=https://github.com/wso2/${WSO2_SERVER_REPOSITORY}/releases/download/v${WSO2_SERVER_VERSION}/${WSO2_SERVER}.zip +ARG WSO2_SERVER_HOME=${USER_HOME}/${WSO2_SERVER} +ARG WSO2_SERVER_DIST_URL= # build argument for MOTD ARG MOTD='printf "\n\ Welcome to WSO2 Docker Resources \n\ diff --git a/dockerfiles/alpine/apim/README.md b/dockerfiles/alpine/apim/README.md index 734b96ba..9d29b32a 100755 --- a/dockerfiles/alpine/apim/README.md +++ b/dockerfiles/alpine/apim/README.md @@ -22,6 +22,7 @@ git clone https://github.com/wso2/docker-apim.git - Navigate to `` directory.
+- Change in Dockerfile to the location of the product pack. Execute `docker build` command as shown below. ``` diff --git a/dockerfiles/centos/apim/Dockerfile b/dockerfiles/centos/apim/Dockerfile index 98971355..c657a3eb 100755 --- a/dockerfiles/centos/apim/Dockerfile +++ b/dockerfiles/centos/apim/Dockerfile @@ -59,7 +59,7 @@ ENV JAVA_HOME=/opt/java/openjdk \ PATH="/opt/java/openjdk/bin:$PATH" LABEL maintainer="WSO2 Docker Maintainers " \ - com.wso2.docker.source="https://github.com/wso2/docker-apim/releases/tag/v4.2.0.0" + com.wso2.docker.source="https://github.com/wso2/docker-apim/releases/tag/v4.2.0.1" # set Docker image build arguments # build arguments for user/group configurations @@ -70,11 +70,11 @@ ARG USER_GROUP_ID=802 ARG USER_HOME=/home/${USER} # build arguments for WSO2 product installation ARG WSO2_SERVER_NAME=wso2am -ARG WSO2_SERVER_VERSION=4.2.0-rc +ARG WSO2_SERVER_VERSION=4.2.0 ARG WSO2_SERVER_REPOSITORY=product-apim ARG WSO2_SERVER=${WSO2_SERVER_NAME}-${WSO2_SERVER_VERSION} -ARG WSO2_SERVER_HOME=${USER_HOME}/wso2am-4.2.0 -ARG WSO2_SERVER_DIST_URL=https://github.com/wso2/${WSO2_SERVER_REPOSITORY}/releases/download/v${WSO2_SERVER_VERSION}/${WSO2_SERVER}.zip +ARG WSO2_SERVER_HOME=${USER_HOME}/${WSO2_SERVER} +ARG WSO2_SERVER_DIST_URL= # build argument for MOTD ARG MOTD='printf "\n\ Welcome to WSO2 Docker resources.\n\ diff --git a/dockerfiles/centos/apim/README.md b/dockerfiles/centos/apim/README.md index 47864cc0..8e1e84ba 100755 --- a/dockerfiles/centos/apim/README.md +++ b/dockerfiles/centos/apim/README.md @@ -21,6 +21,7 @@ git clone https://github.com/wso2/docker-apim.git #### 2. Build the Docker image. - Navigate to `` directory.
+- Change in Dockerfile to the location of the product pack. Execute `docker build` command as shown below. ``` diff --git a/dockerfiles/jdk11/alpine/apim/Dockerfile b/dockerfiles/jdk11/alpine/apim/Dockerfile index ac314440..188299dc 100755 --- a/dockerfiles/jdk11/alpine/apim/Dockerfile +++ b/dockerfiles/jdk11/alpine/apim/Dockerfile @@ -55,7 +55,7 @@ ENV JAVA_HOME=/opt/java/openjdk \ PATH="/opt/java/openjdk/bin:$PATH" LABEL maintainer="WSO2 Docker Maintainers " \ - com.wso2.docker.source="https://github.com/wso2/docker-apim/releases/tag/v4.2.0.0" + com.wso2.docker.source="https://github.com/wso2/docker-apim/releases/tag/v4.2.0.1" # set Docker image build arguments # build arguments for user/group configurations @@ -66,11 +66,11 @@ ARG USER_GROUP_ID=802 ARG USER_HOME=/home/${USER} # build arguments for WSO2 product installation ARG WSO2_SERVER_NAME=wso2am -ARG WSO2_SERVER_VERSION=4.2.0-rc +ARG WSO2_SERVER_VERSION=4.2.0 ARG WSO2_SERVER_REPOSITORY=product-apim ARG WSO2_SERVER=${WSO2_SERVER_NAME}-${WSO2_SERVER_VERSION} -ARG WSO2_SERVER_HOME=${USER_HOME}/wso2am-4.2.0 -ARG WSO2_SERVER_DIST_URL=https://github.com/wso2/${WSO2_SERVER_REPOSITORY}/releases/download/v${WSO2_SERVER_VERSION}/${WSO2_SERVER}.zip +ARG WSO2_SERVER_HOME=${USER_HOME}/${WSO2_SERVER} +ARG WSO2_SERVER_DIST_URL= # build argument for MOTD ARG MOTD='printf "\n\ Welcome to WSO2 Docker Resources \n\ diff --git a/dockerfiles/jdk11/alpine/apim/README.md b/dockerfiles/jdk11/alpine/apim/README.md index 255adfaf..f8759134 100755 --- a/dockerfiles/jdk11/alpine/apim/README.md +++ b/dockerfiles/jdk11/alpine/apim/README.md @@ -22,6 +22,7 @@ git clone https://github.com/wso2/docker-apim.git - Navigate to `` directory.
+- Change in Dockerfile to the location of the product pack. Execute `docker build` command as shown below. ``` diff --git a/dockerfiles/jdk11/centos/apim/Dockerfile b/dockerfiles/jdk11/centos/apim/Dockerfile index 0c2ebe0b..b10e57e5 100755 --- a/dockerfiles/jdk11/centos/apim/Dockerfile +++ b/dockerfiles/jdk11/centos/apim/Dockerfile @@ -59,7 +59,7 @@ ENV JAVA_HOME=/opt/java/openjdk \ PATH="/opt/java/openjdk/bin:$PATH" LABEL maintainer="WSO2 Docker Maintainers " \ - com.wso2.docker.source="https://github.com/wso2/docker-apim/releases/tag/v4.2.0.0" + com.wso2.docker.source="https://github.com/wso2/docker-apim/releases/tag/v4.2.0.1" # set Docker image build arguments # build arguments for user/group configurations @@ -70,11 +70,11 @@ ARG USER_GROUP_ID=802 ARG USER_HOME=/home/${USER} # build arguments for WSO2 product installation ARG WSO2_SERVER_NAME=wso2am -ARG WSO2_SERVER_VERSION=4.2.0-rc +ARG WSO2_SERVER_VERSION=4.2.0 ARG WSO2_SERVER_REPOSITORY=product-apim ARG WSO2_SERVER=${WSO2_SERVER_NAME}-${WSO2_SERVER_VERSION} -ARG WSO2_SERVER_HOME=${USER_HOME}/wso2am-4.2.0 -ARG WSO2_SERVER_DIST_URL=https://github.com/wso2/${WSO2_SERVER_REPOSITORY}/releases/download/v${WSO2_SERVER_VERSION}/${WSO2_SERVER}.zip +ARG WSO2_SERVER_HOME=${USER_HOME}/${WSO2_SERVER} +ARG WSO2_SERVER_DIST_URL= # build argument for MOTD ARG MOTD='printf "\n\ Welcome to WSO2 Docker resources.\n\ diff --git a/dockerfiles/jdk11/centos/apim/README.md b/dockerfiles/jdk11/centos/apim/README.md index 3c4a8a9d..60d10fe9 100755 --- a/dockerfiles/jdk11/centos/apim/README.md +++ b/dockerfiles/jdk11/centos/apim/README.md @@ -21,6 +21,7 @@ git clone https://github.com/wso2/docker-apim.git #### 2. Build the Docker image. - Navigate to `` directory.
+- Change in Dockerfile to the location of the product pack. Execute `docker build` command as shown below. ``` diff --git a/dockerfiles/jdk11/ubuntu/apim/Dockerfile b/dockerfiles/jdk11/ubuntu/apim/Dockerfile index 499ce619..d02323cb 100755 --- a/dockerfiles/jdk11/ubuntu/apim/Dockerfile +++ b/dockerfiles/jdk11/ubuntu/apim/Dockerfile @@ -70,7 +70,7 @@ ENV JAVA_HOME=/opt/java/openjdk \ PATH="/opt/java/openjdk/bin:$PATH" LABEL maintainer="WSO2 Docker Maintainers " \ - com.wso2.docker.source="https://github.com/wso2/docker-apim/releases/tag/v4.2.0.0" + com.wso2.docker.source="https://github.com/wso2/docker-apim/releases/tag/v4.2.0.1" # set Docker image build arguments # build arguments for user/group configurations @@ -81,11 +81,11 @@ ARG USER_GROUP_ID=802 ARG USER_HOME=/home/${USER} # build arguments for WSO2 product installation ARG WSO2_SERVER_NAME=wso2am -ARG WSO2_SERVER_VERSION=4.2.0-rc +ARG WSO2_SERVER_VERSION=4.2.0 ARG WSO2_SERVER_REPOSITORY=product-apim ARG WSO2_SERVER=${WSO2_SERVER_NAME}-${WSO2_SERVER_VERSION} -ARG WSO2_SERVER_HOME=${USER_HOME}/wso2am-4.2.0 -ARG WSO2_SERVER_DIST_URL=https://github.com/wso2/${WSO2_SERVER_REPOSITORY}/releases/download/v${WSO2_SERVER_VERSION}/${WSO2_SERVER}.zip +ARG WSO2_SERVER_HOME=${USER_HOME}/${WSO2_SERVER} +ARG WSO2_SERVER_DIST_URL= # build argument for MOTD ARG MOTD="\n\ Welcome to WSO2 Docker resources.\n\ diff --git a/dockerfiles/jdk11/ubuntu/apim/README.md b/dockerfiles/jdk11/ubuntu/apim/README.md index 1aabde1b..7a60aeb6 100755 --- a/dockerfiles/jdk11/ubuntu/apim/README.md +++ b/dockerfiles/jdk11/ubuntu/apim/README.md @@ -20,6 +20,7 @@ git clone https://github.com/wso2/docker-apim.git #### 2. Build the Docker image. - Navigate to `` directory.
+- Change in Dockerfile to the location of the product pack. Execute `docker build` command as shown below. ``` docker build -t wso2am:4.2.0-jdk11 . diff --git a/dockerfiles/ubuntu/apim/Dockerfile b/dockerfiles/ubuntu/apim/Dockerfile index 5a7ad94e..1fbfe4c1 100755 --- a/dockerfiles/ubuntu/apim/Dockerfile +++ b/dockerfiles/ubuntu/apim/Dockerfile @@ -70,7 +70,7 @@ ENV JAVA_HOME=/opt/java/openjdk \ PATH="/opt/java/openjdk/bin:$PATH" LABEL maintainer="WSO2 Docker Maintainers " \ - com.wso2.docker.source="https://github.com/wso2/docker-apim/releases/tag/v4.2.0.0" + com.wso2.docker.source="https://github.com/wso2/docker-apim/releases/tag/v4.2.0.1" # set Docker image build arguments # build arguments for user/group configurations @@ -81,11 +81,11 @@ ARG USER_GROUP_ID=802 ARG USER_HOME=/home/${USER} # build arguments for WSO2 product installation ARG WSO2_SERVER_NAME=wso2am -ARG WSO2_SERVER_VERSION=4.2.0-rc +ARG WSO2_SERVER_VERSION=4.2.0 ARG WSO2_SERVER_REPOSITORY=product-apim ARG WSO2_SERVER=${WSO2_SERVER_NAME}-${WSO2_SERVER_VERSION} -ARG WSO2_SERVER_HOME=${USER_HOME}/wso2am-4.2.0 -ARG WSO2_SERVER_DIST_URL=https://github.com/wso2/${WSO2_SERVER_REPOSITORY}/releases/download/v${WSO2_SERVER_VERSION}/${WSO2_SERVER}.zip +ARG WSO2_SERVER_HOME=${USER_HOME}/${WSO2_SERVER} +ARG WSO2_SERVER_DIST_URL= # build argument for MOTD ARG MOTD="\n\ Welcome to WSO2 Docker resources.\n\ diff --git a/dockerfiles/ubuntu/apim/README.md b/dockerfiles/ubuntu/apim/README.md index 43f41d78..bd57a83e 100755 --- a/dockerfiles/ubuntu/apim/README.md +++ b/dockerfiles/ubuntu/apim/README.md @@ -20,6 +20,7 @@ git clone https://github.com/wso2/docker-apim.git #### 2. Build the Docker image. - Navigate to `` directory.
+- Change in Dockerfile to the location of the product pack. Execute `docker build` command as shown below. ``` docker build -t wso2am:4.2.0 .