Modified run-sh (c21c3861) · Commits · OCF / capif

services/run.sh

+14 −14

Original line number	Original line	Diff line number	Diff line
	@@ -77,9 +77,9 @@ echo Nginx hostname will be $HOSTNAME, deploy $DEPLOY, monitoring $MONITORING_ST
	if [ "$MONITORING_STATE" == "true" ] ; then		if [ "$MONITORING_STATE" == "true" ] ; then
	echo '*Monitoring set as true*'		echo '*Monitoring set as true*'
	echo '*Creating Monitoring stack*'		echo '*Creating Monitoring stack*'
			DUID=$DUID DGID=$DGID docker compose -f "$SERVICES_DIR/monitoring/docker-compose.yml" up --detach --build $CACHED_INFO
	DUID=$DUID DGID=$DGID docker compose -f "$SERVICES_DIR/monitoring/docker-compose.yml" build $CACHED_INFO		# DUID=$DUID DGID=$DGID docker compose -f "$SERVICES_DIR/monitoring/docker-compose.yml" build $CACHED_INFO
	DUID=$DUID DGID=$DGID docker compose -f "$SERVICES_DIR/monitoring/docker-compose.yml" up --detach		# DUID=$DUID DGID=$DGID docker compose -f "$SERVICES_DIR/monitoring/docker-compose.yml" up --detach
	status=$?		status=$?
	if [ $status -eq 0 ]; then		if [ $status -eq 0 ]; then
	echo "* Monitoring Stack Runing *"		echo "* Monitoring Stack Runing *"
	@@ -91,9 +91,9 @@ fi

	docker network create capif-network		docker network create capif-network

	# docker compose -f "$SERVICES_DIR/docker-compose-vault.yml" up --detach --build		docker compose -f "$SERVICES_DIR/docker-compose-vault.yml" up --detach --build $CACHED_INFO
	docker compose -f "$SERVICES_DIR/docker-compose-vault.yml" build $CACHED_INFO		# docker compose -f "$SERVICES_DIR/docker-compose-vault.yml" build $CACHED_INFO
	docker compose -f "$SERVICES_DIR/docker-compose-vault.yml" up --detach		# docker compose -f "$SERVICES_DIR/docker-compose-vault.yml" up --detach
	status=$?		status=$?
	if [ $status -eq 0 ]; then		if [ $status -eq 0 ]; then
	echo "* Vault Service Runing *"		echo "* Vault Service Runing *"
	@@ -102,9 +102,9 @@ else
	exit $status		exit $status
	fi		fi

	# CAPIF_HOSTNAME=$HOSTNAME MONITORING=$MONITORING_STATE LOG_LEVEL=$LOG_LEVEL docker compose -f "$SERVICES_DIR/docker-compose-capif.yml" up --detach --build		CAPIF_HOSTNAME=$HOSTNAME MONITORING=$MONITORING_STATE LOG_LEVEL=$LOG_LEVEL docker compose -f "$SERVICES_DIR/docker-compose-capif.yml" up --detach --build $CACHED_INFO
	CAPIF_HOSTNAME=$HOSTNAME MONITORING=$MONITORING_STATE LOG_LEVEL=$LOG_LEVEL docker compose -f "$SERVICES_DIR/docker-compose-capif.yml" build $CACHED_INFO		# CAPIF_HOSTNAME=$HOSTNAME MONITORING=$MONITORING_STATE LOG_LEVEL=$LOG_LEVEL docker compose -f "$SERVICES_DIR/docker-compose-capif.yml" build $CACHED_INFO
	CAPIF_HOSTNAME=$HOSTNAME MONITORING=$MONITORING_STATE LOG_LEVEL=$LOG_LEVEL docker compose -f "$SERVICES_DIR/docker-compose-capif.yml" up --detach		# CAPIF_HOSTNAME=$HOSTNAME MONITORING=$MONITORING_STATE LOG_LEVEL=$LOG_LEVEL docker compose -f "$SERVICES_DIR/docker-compose-capif.yml" up --detach

	status=$?		status=$?
	if [ $status -eq 0 ]; then		if [ $status -eq 0 ]; then
	@@ -116,9 +116,9 @@ fi


	CAPIF_PRIV_KEY_BASE_64=$(echo "$(cat nginx/certs/server.key)")		CAPIF_PRIV_KEY_BASE_64=$(echo "$(cat nginx/certs/server.key)")
	# CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 LOG_LEVEL=$LOG_LEVEL docker compose -f "$SERVICES_DIR/docker-compose-register.yml" up --detach --build		CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 LOG_LEVEL=$LOG_LEVEL docker compose -f "$SERVICES_DIR/docker-compose-register.yml" up --detach --build $CACHED_INFO
	CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 LOG_LEVEL=$LOG_LEVEL docker compose -f "$SERVICES_DIR/docker-compose-register.yml" build $CACHED_INFO		# CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 LOG_LEVEL=$LOG_LEVEL docker compose -f "$SERVICES_DIR/docker-compose-register.yml" build $CACHED_INFO
	CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 LOG_LEVEL=$LOG_LEVEL docker compose -f "$SERVICES_DIR/docker-compose-register.yml" up --detach		# CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 LOG_LEVEL=$LOG_LEVEL docker compose -f "$SERVICES_DIR/docker-compose-register.yml" up --detach

	status=$?		status=$?
	if [ $status -eq 0 ]; then		if [ $status -eq 0 ]; then
	@@ -132,9 +132,9 @@ if [ "$ROBOT_MOCK_SERVER" == "true" ] ; then
	echo '*Robot Mock Server set as true*'		echo '*Robot Mock Server set as true*'
	echo '*Creating Robot Mock Server stack*'		echo '*Creating Robot Mock Server stack*'

			IP=$IP PORT=$PORT docker compose -f "$SERVICES_DIR/docker-compose-mock-server.yml" up --detach --build $CACHED_INFO
			# IP=$IP PORT=$PORT docker compose -f "$SERVICES_DIR/docker-compose-mock-server.yml" build $CACHED_INFO
	# IP=$IP PORT=$PORT docker compose -f "$SERVICES_DIR/docker-compose-mock-server.yml" up --detach		# IP=$IP PORT=$PORT docker compose -f "$SERVICES_DIR/docker-compose-mock-server.yml" up --detach
	IP=$IP PORT=$PORT docker compose -f "$SERVICES_DIR/docker-compose-mock-server.yml" build $CACHED_INFO
	IP=$IP PORT=$PORT docker compose -f "$SERVICES_DIR/docker-compose-mock-server.yml" up --detach
	status=$?		status=$?
	if [ $status -eq 0 ]; then		if [ $status -eq 0 ]; then
	echo "* Monitoring Stack Runing *"		echo "* Monitoring Stack Runing *"

services/show_logs.sh

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -59,7 +59,7 @@ while getopts "cvrahmfs" opt; do
	;;		;;
	a)		a)
	echo "Show all services"		echo "Show all services"
	FILES=("-f $SERVICES_DIR/docker-compose-capif.yml" -f "$SERVICES_DIR/docker-compose-vault.yml" -f "$SERVICES_DIR/docker-compose-register.yml" -f "$SERVICES_DIR/docker-compose-mock-server.yml" -f "$SERVICES_DIR./monitoring/docker-compose.yml")		FILES=("-f $SERVICES_DIR/docker-compose-capif.yml" -f "$SERVICES_DIR/docker-compose-vault.yml" -f "$SERVICES_DIR/docker-compose-register.yml" -f "$SERVICES_DIR/docker-compose-mock-server.yml" -f "$SERVICES_DIR/monitoring/docker-compose.yml")
	;;		;;
	f)		f)
	echo "Setup follow logs"		echo "Setup follow logs"