Skip to content

Commit c1d452d

Browse files
nirmaynirmay
authored
Merge pull request #525 from Beckn-One/517-beckn-onix-script
Issue [517] [518] Refactor beckn-onix.sh to skip BAP/BPP containers and remove Vault dependency in setup.sh
2 parents 79a7914 + 291fa7e commit c1d452d

File tree

3 files changed

+103
-236
lines changed

3 files changed

+103
-236
lines changed

‎install/beckn-onix.sh‎

Lines changed: 11 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,10 @@ update_registry_details() {
5252
docker run --rm -v $SCRIPT_DIR/../registry_data/config:/source -v registry_data_volume:/target busybox cp /source/{envvars,logger.properties,swf.properties} /target/
5353
docker rmi busybox
5454
}
55-
# Function to start the MongoDB, Redis, and RabbitMQ Services
55+
# Function to start Redis service only
5656
start_support_services() {
5757
#ignore orphaned containers warning
5858
export COMPOSE_IGNORE_ORPHANS=1
59-
echo "${GREEN}................Installing MongoDB................${NC}"
60-
docker compose -f docker-compose-app.yml up -d mongo_db
61-
echo "MongoDB installation successful"
62-
63-
echo "${GREEN}................Installing RabbitMQ................${NC}"
64-
docker compose -f docker-compose-app.yml up -d queue_service
65-
echo "RabbitMQ installation successful"
66-
6759
echo "${GREEN}................Installing Redis................${NC}"
6860
docker compose -f docker-compose-app.yml up -d redis_db
6961
echo "Redis installation successful"
@@ -128,9 +120,8 @@ install_layer2_config() {
128120
rm -f $FILENAME >/dev/null 2>&1
129121
}
130122

131-
# Function to install BAP Protocol Server
123+
# Function to install BAP Protocol Server - creates registry entries only
132124
install_bap_protocol_server() {
133-
start_support_services
134125
if [[ $1 ]]; then
135126
registry_url=$1
136127
bap_subscriber_id=$2
@@ -140,35 +131,12 @@ install_bap_protocol_server() {
140131
else
141132
bash scripts/update_bap_config.sh
142133
fi
143-
sleep 10
144-
docker volume create bap_client_config_volume
145-
docker volume create bap_network_config_volume
146-
docker run --rm -v $SCRIPT_DIR/../protocol-server-data:/source -v bap_client_config_volume:/target busybox cp /source/bap-client.yml /target/default.yml
147-
docker run --rm -v $SCRIPT_DIR/../protocol-server-data:/source -v bap_client_config_volume:/target busybox cp /source/bap-client.yaml-sample /target
148-
docker run --rm -v $SCRIPT_DIR/../protocol-server-data:/source -v bap_network_config_volume:/target busybox cp /source/bap-network.yml /target/default.yml
149-
docker run --rm -v $SCRIPT_DIR/../protocol-server-data:/source -v bap_network_config_volume:/target busybox cp /source/bap-network.yaml-sample /target
150-
docker rmi busybox
151-
152-
start_container $bap_docker_compose_file "bap-client"
153-
sleep 20
154-
start_container $bap_docker_compose_file "bap-network"
155-
sleep 10
156-
157-
if [[ -z "$layer2_url" ]]; then
158-
echo -e "${BoldGreen}Please download the Layer 2 configuration files by running the download_layer_2_config_bap.sh script located in the ../layer2 folder."
159-
echo -e "For further information, refer to this URL:${BLUE}https://github.com/beckn/beckn-onix/blob/main/docs/user_guide.md#downloading-layer-2-configuration-for-a-domain.${NC}"
160-
else
161-
echo -e "${GREEN}Installing layer configuration for $(basename "$layer2_url")${NC}"
162-
install_layer2_config bap-client
163-
install_layer2_config bap-network
164-
fi
165-
echo "Protocol server BAP installation successful"
166-
sleep 40
134+
135+
echo "Protocol server BAP registry entries created successfully"
167136
}
168137

169-
# Function to install BPP Protocol Server without Sandbox
138+
# Function to install BPP Protocol Server - creates registry entries only
170139
install_bpp_protocol_server() {
171-
start_support_services
172140
echo "${GREEN}................Installing Protocol Server for BPP................${NC}"
173141

174142
if [[ $1 ]]; then
@@ -182,27 +150,7 @@ install_bpp_protocol_server() {
182150
bash scripts/update_bpp_config.sh
183151
fi
184152

185-
sleep 10
186-
docker volume create bpp_client_config_volume
187-
docker volume create bpp_network_config_volume
188-
docker run --rm -v $SCRIPT_DIR/../protocol-server-data:/source -v bpp_client_config_volume:/target busybox cp /source/bpp-client.yml /target/default.yml
189-
docker run --rm -v $SCRIPT_DIR/../protocol-server-data:/source -v bpp_client_config_volume:/target busybox cp /source/bpp-client.yaml-sample /target
190-
docker run --rm -v $SCRIPT_DIR/../protocol-server-data:/source -v bpp_network_config_volume:/target busybox cp /source/bpp-network.yml /target/default.yml
191-
docker run --rm -v $SCRIPT_DIR/../protocol-server-data:/source -v bpp_network_config_volume:/target busybox cp /source/bpp-network.yaml-sample /target
192-
docker rmi busybox
193-
194-
start_container $bpp_docker_compose_file "bpp-client"
195-
start_container $bpp_docker_compose_file "bpp-network"
196-
sleep 10
197-
if [[ -z "$layer2_url" ]]; then
198-
echo -e "${BoldGreen}Please download the Layer 2 configuration files by running the download_layer_2_config_bpp.sh script located in the ../layer2 folder."
199-
echo -e "For further information, refer to this URL:${BLUE} https://github.com/beckn/beckn-onix/blob/main/docs/user_guide.md#downloading-layer-2-configuration-for-a-domain.${NC}"
200-
else
201-
echo -e "${BoldGreen}Installing layer configuration for $(basename "$layer2_url")"
202-
install_layer2_config bpp-client
203-
install_layer2_config bpp-network
204-
fi
205-
echo "Protocol server BPP installation successful"
153+
echo "Protocol server BPP registry entries created successfully"
206154
}
207155

208156
mergingNetworks() {
@@ -260,11 +208,6 @@ mergingNetworks() {
260208

261209
# Function to install BPP Protocol Server with Sandbox
262210
install_bpp_protocol_server_with_sandbox() {
263-
start_support_services
264-
265-
docker volume create bpp_client_config_volume
266-
docker volume create bpp_network_config_volume
267-
268211
echo "${GREEN}................Installing Sandbox................${NC}"
269212
start_container $bpp_docker_compose_file_sandbox "sandbox-api"
270213
sleep 5
@@ -283,17 +226,7 @@ install_bpp_protocol_server_with_sandbox() {
283226
bash scripts/update_bpp_config.sh
284227
fi
285228

286-
sleep 10
287-
docker run --rm -v $SCRIPT_DIR/../protocol-server-data:/source -v bpp_client_config_volume:/target busybox cp /source/bpp-client.yml /target/default.yml
288-
docker run --rm -v $SCRIPT_DIR/../protocol-server-data:/source -v bpp_client_config_volume:/target busybox cp /source/bpp-client.yaml-sample /target
289-
docker run --rm -v $SCRIPT_DIR/../protocol-server-data:/source -v bpp_network_config_volume:/target busybox cp /source/bpp-network.yml /target/default.yml
290-
docker run --rm -v $SCRIPT_DIR/../protocol-server-data:/source -v bpp_network_config_volume:/target busybox cp /source/bpp-network.yaml-sample /target
291-
docker rmi busybox
292-
293-
start_container $bpp_docker_compose_file "bpp-client"
294-
start_container $bpp_docker_compose_file "bpp-network"
295-
sleep 10
296-
echo "Protocol server BPP installation successful"
229+
echo "Protocol server BPP registry entries created successfully"
297230
}
298231

299232
layer2_config() {
@@ -465,7 +398,7 @@ completeSetup() {
465398
bap_subscriber_key_id="$bap_subscriber_id-key"
466399
public_address=$bap_subscriber_url
467400

468-
layer2_config
401+
# layer2_config # Commented out - ONIX adapter handles schemas differently
469402
install_package
470403
install_bap_protocol_server $registry_url $bap_subscriber_id $bap_subscriber_key_id $bap_subscriber_url
471404
;;
@@ -512,7 +445,7 @@ completeSetup() {
512445
bpp_subscriber_key_id="$bpp_subscriber_id-key"
513446
public_address=$bpp_subscriber_url
514447

515-
layer2_config
448+
# layer2_config # Commented out - ONIX adapter handles schemas differently
516449
install_package
517450
install_bpp_protocol_server $registry_url $bpp_subscriber_id $bpp_subscriber_key_id $bpp_subscriber_url $webhook_url
518451
;;
@@ -578,7 +511,7 @@ completeSetup() {
578511

579512
install_gateway $registry_url $gateway_url
580513

581-
layer2_config
514+
# layer2_config # Commented out - ONIX adapter handles schemas differently
582515
#Append /subscribers for registry_url
583516
new_registry_url="${registry_url%/}/subscribers"
584517
bap_subscriber_key_id="$bap_subscriber_id-key"
@@ -702,6 +635,7 @@ update_network() {
702635
}
703636

704637
install_adapter() {
638+
start_support_services
705639
start_container $adapter_docker_compose_file "onix-adapter"
706640
sleep 10
707641
echo "ONIX Adapter installation successful"

‎install/docker-compose-adapter2.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3.8'
22

33
services:
44
onix-adapter:
5-
image: onix-adapter
5+
image: fidedocker/onix-adapter
66
container_name: onix-adapter
77
platform: linux/amd64
88
networks:

0 commit comments

Comments
 (0)