Skip to content

Commit

Permalink
Merge pull request #1575 from AmaliMatharaarachchi/m4-release
Browse files Browse the repository at this point in the history
Prepare for 4.0.0-m4 release
  • Loading branch information
AmaliMatharaarachchi authored Jan 26, 2021
2 parents 004a86c + 7165d94 commit 3fafe47
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,15 @@ microservice architectures efficiently.
- Make sure you have installed *docker* on your machine.
- Make sure you have installed the *docker-compose* on your machine

Let's host our first API on a Microgateway. We will be exposing the publicly available [petstore services](https://petstore.swagger.io/) via microgateway
Let's host our first API on a Microgateway. We will be exposing the publicly available [petstore services](https://petstore.swagger.io/) via microgateway.

1. First download the CLI tool(APICTL) and the microgateway distribution from the
[github release page](https://github.com/wso2/product-microgateway/releases)
1. First download the CLI tool(APICTL) and the microgateway distributions
and extract them to a folder of your choice.
* [CLI (APICTL)](https://github.com/wso2/product-microgateway/releases)
* [Microgateway Distribution](https://github.com/wso2/product-microgateway/releases)
* [CLI (APICTL)](https://github.com/wso2/product-apim-tooling/releases/tag/4.0.0-M5)
* [Microgateway Distribution](https://github.com/wso2/product-microgateway/releases/tag/v4.0.0-m4)

Note: WSO2 Microgateway v4.0.0-m4 is compatible with APICTL 4.0.0-M5.

CLI tool extracted location will be referred as `CLI_HOME` and Microgateway distribution extracted location would be
referred as `MG_HOME`.

Expand Down Expand Up @@ -78,7 +79,7 @@ TOKEN=eyJ4NXQiOiJNell4TW1Ga09HWXdNV0kwWldObU5EY3hOR1l3WW1NNFpUQTNNV0kyTkRBelpHUX

8. We can now invoke the API running on the microgateway using cURL as below.
```
curl -X GET "https://localhost:9095/v2/pet/1" -H "accept: application/json" -H "Authorization:Bearer $TOKEN" -k
curl -X GET "https://localhost:9095/v2/pet/findByStatus?status=available" -H "accept: application/json" -H "Authorization:Bearer $TOKEN" -k
```


Expand Down
2 changes: 1 addition & 1 deletion developer-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ maven plugin would fail to create the new docker images)
java-11 as the source)

- Navigate to distribution/target/.
Then extract the zip file called wso2am-micro-gw-4.0.0-m4-SNAPSHOT.zip
Then extract the zip file called wso2am-micro-gw-4.0.0-m4.zip

- Then execute `docker-compose up` to run the setup. This will start an envoy container,
filter-core container and piot container. The mounted configurations can be found from
Expand Down
2 changes: 1 addition & 1 deletion remove-containers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# -----------------------------------------------------------------------

# Just to assist developers by removing all the containers.
micro_gw_version=4.0.0-m4-SNAPSHOT
micro_gw_version=4.0.0-m4

docker kill $(docker ps -a | grep wso2/mg-enforcer:$micro_gw_version | awk '{print $1}')
docker rm $(docker ps -a | grep wso2/mg-enforcer:$micro_gw_version | awk '{print $1}')
Expand Down
6 changes: 3 additions & 3 deletions resources/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3.7"
services:
router:
image: wso2/mg-router:4.0.0-m4-SNAPSHOT
image: wso2/mg-router:4.0.0-m4
volumes:
- ./resources/router/security:/home/wso2/security
ports:
Expand All @@ -11,15 +11,15 @@ services:
- adapter
- enforcer
adapter:
image: wso2/mg-adapter:4.0.0-m4-SNAPSHOT
image: wso2/mg-adapter:4.0.0-m4
volumes:
- ./resources/adapter/security:/home/wso2/security
- ./resources/conf:/home/wso2/conf
ports:
- "18000:18000"
- "9843:9843"
enforcer:
image: wso2/mg-enforcer:4.0.0-m4-SNAPSHOT
image: wso2/mg-enforcer:4.0.0-m4
volumes:
- ./resources/enforcer/security:/home/wso2/mg/security
- ./resources/conf:/home/wso2/conf
Expand Down

0 comments on commit 3fafe47

Please sign in to comment.