Skip to content

Commit

Permalink
Merge pull request #1868 from dinusha92/main
Browse files Browse the repository at this point in the history
Dev iteration for beta.
  • Loading branch information
dinusha92 authored Apr 8, 2021
2 parents 49175dd + ec0ee6e commit b49d747
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
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=0.9.0-SNAPSHOT
micro_gw_version=0.9.0-beta-SNAPSHOT

docker kill "$(docker ps -a | grep wso2/choreo-connect-enforcer:$micro_gw_version | awk '{print $1}')"
docker rm "$(docker ps -a | grep wso2/choreo-connect-enforcer:$micro_gw_version | awk '{print $1}')"
Expand Down
6 changes: 3 additions & 3 deletions resources/docker-compose/apim/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
volumes:
- ./conf/deployment.toml:/home/wso2carbon/wso2am-4.0.0-beta/repository/conf/deployment.toml
router:
image: wso2/choreo-connect-router:0.9.0-alpha
image: wso2/choreo-connect-router:0.9.0-beta-SNAPSHOT
logging:
options:
max-size: "20m"
Expand Down Expand Up @@ -42,7 +42,7 @@ services:
- adapter
- enforcer
adapter:
image: wso2/choreo-connect-adapter:0.9.0-alpha
image: wso2/choreo-connect-adapter:0.9.0-beta-SNAPSHOT
logging:
options:
max-size: "20m"
Expand All @@ -64,7 +64,7 @@ services:
links:
- apim
enforcer:
image: wso2/choreo-connect-enforcer:0.9.0-alpha
image: wso2/choreo-connect-enforcer:0.9.0-beta-SNAPSHOT
logging:
options:
max-size: "20m"
Expand Down
6 changes: 3 additions & 3 deletions resources/docker-compose/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3.7"
services:
router:
image: wso2/choreo-connect-router:0.9.0-alpha
image: wso2/choreo-connect-router:0.9.0-beta-SNAPSHOT
logging:
options:
max-size: "20m"
Expand Down Expand Up @@ -30,7 +30,7 @@ services:
- adapter
- enforcer
adapter:
image: wso2/choreo-connect-adapter:0.9.0-alpha
image: wso2/choreo-connect-adapter:0.9.0-beta-SNAPSHOT
logging:
options:
max-size: "20m"
Expand All @@ -45,7 +45,7 @@ services:
- "18000:18000"
- "9843:9843"
enforcer:
image: wso2/choreo-connect-enforcer:0.9.0-alpha
image: wso2/choreo-connect-enforcer:0.9.0-beta-SNAPSHOT
logging:
options:
max-size: "20m"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
- mountPath: /home/wso2/conf/log_config.toml
subPath: log_config.toml
name: logconfig-toml-vol
image: wso2/choreo-connect-adapter:0.9.0-alpha
image: wso2/choreo-connect-adapter:0.9.0-beta-SNAPSHOT
imagePullPolicy: Always
env:
- name: cp_admin_pwd
Expand Down
4 changes: 2 additions & 2 deletions resources/k8s-artifacts/choreo-connect/mg-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ spec:
name: logconfig-toml-vol
- mountPath: /home/wso2/lib/dropins
name: dropins-vol
image: wso2/choreo-connect-enforcer:0.9.0-alpha
image: wso2/choreo-connect-enforcer:0.9.0-beta-SNAPSHOT
imagePullPolicy: Always
env:
- name: ENFORCER_PRIVATE_KEY_PATH
Expand Down Expand Up @@ -112,7 +112,7 @@ spec:
name: router-keystore-vol
- mountPath: /home/wso2/security/truststore
name: router-truststore-vol
image: wso2/choreo-connect-router:0.9.0-alpha
image: wso2/choreo-connect-router:0.9.0-beta-SNAPSHOT
imagePullPolicy: Always
env:
- name: ROUTER_ADMIN_HOST
Expand Down

0 comments on commit b49d747

Please sign in to comment.