Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PLAT-524 #164

Draft
wants to merge 11 commits into
base: main
Choose a base branch
from
+262 −54
Draft

PLAT-524 #164

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
132a08a
added --with-registry-auth flag to deploys
Mark-Labuschagne Oct 20, 2022
490b38b
register sync/async channels for JeMPI
Mark-Labuschagne Nov 25, 2022
9372073
Merge branch 'main' into PLAT-524-dockerhub-login-fix
Mark-Labuschagne Nov 25, 2022
e020f1c
added registry auth flags to incoming services
Mark-Labuschagne Nov 25, 2022
85db90e
Merge branch 'main' into PLAT-623-sync-receiver-openhim-import
Mark-Labuschagne Nov 29, 2022
51b8a37
Merge branch 'main' into PLAT-623-sync-receiver-openhim-import
Mark-Labuschagne Nov 29, 2022
85f36e5
Update client-registry-jempi/importer/openhim/openhimConfig.js
Mark-Labuschagne Nov 29, 2022
d832424
Update client-registry-jempi/swarm.sh
Mark-Labuschagne Nov 29, 2022
524e64a
removed obselete defaults
Mark-Labuschagne Nov 29, 2022
6093a50
linting
Mark-Labuschagne Nov 29, 2022
3439ed9
Merge branches 'PLAT-623-sync-receiver-openhim-import' and 'PLAT-524-…
Mark-Labuschagne Nov 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
added registry auth flags to incoming services 
PLAT-524
@Mark-Labuschagne
Mark-Labuschagne committed Nov 25, 2022
commit e020f1ca8620a7506666282dfb24127e62edd58f
8 changes: 4 additions & 4 deletions client-registry-jempi/swarm.sh
View file
Original file line number Diff line number Diff line change
@@ -36,19 +36,19 @@ main() {
fi

if [[ "${ACTION}" == "init" ]] || [[ "${ACTION}" == "up" ]]; then
try "docker stack deploy -c ${COMPOSE_FILE_PATH}/docker-compose.kafka.yml instant" "Failed to deploy Client Registry - JeMPI"
try "docker stack deploy -c ${COMPOSE_FILE_PATH}/docker-compose.kafka.yml --with-registry-auth instant" "Failed to deploy Client Registry - JeMPI"

docker::await_service_ready jempi-kafka-01
docker::await_service_ready jempi-kafka-02
docker::await_service_ready jempi-kafka-03

try "docker stack deploy -c ${COMPOSE_FILE_PATH}/docker-compose.kafdrop.yml $kafdrop_dev_compose_param instant" "Failed to deploy jempi-Kafdrop"
try "docker stack deploy -c ${COMPOSE_FILE_PATH}/docker-compose.kafdrop.yml $kafdrop_dev_compose_param --with-registry-auth instant" "Failed to deploy jempi-Kafdrop"

docker::await_service_ready jempi-kafdrop

config::set_config_digests "${COMPOSE_FILE_PATH}"/importer/docker-compose.config.yml

try "docker stack deploy -c ${COMPOSE_FILE_PATH}/importer/docker-compose.config.yml instant" "Failed to deploy jempi-kafka-config-importer"
try "docker stack deploy -c ${COMPOSE_FILE_PATH}/importer/docker-compose.config.yml --with-registry-auth instant" "Failed to deploy jempi-kafka-config-importer"

log info "Waiting to give JeMPI Kafka config importer time to run before cleaning up service"

@@ -57,7 +57,7 @@ main() {

config::remove_stale_service_configs "${COMPOSE_FILE_PATH}"/importer/docker-compose.config.yml "jempi-kafka"

try "docker stack deploy -c ${COMPOSE_FILE_PATH}/docker-compose.dgraph.yml $dgraph_dev_compose_param $dgraph_cluster_compose_param instant" "Failed to deploy Client Registry - JeMPI"
try "docker stack deploy -c ${COMPOSE_FILE_PATH}/docker-compose.dgraph.yml $dgraph_dev_compose_param $dgraph_cluster_compose_param --with-registry-auth instant" "Failed to deploy Client Registry - JeMPI"

docker::await_service_ready jempi-zero-01

4 changes: 2 additions & 2 deletions mpi-mediator/swarm.sh
View file
Original file line number Diff line number Diff line change
@@ -35,11 +35,11 @@ main() {

if [[ "$ACTION" == "init" ]]; then
log info "Deploying MPI-Mediator..."
try "docker stack deploy -c $COMPOSE_FILE_PATH/docker-compose.yml $mpi_mediator_cluster_compose_param $mpi_mediator_dev_compose_param instant" "Failed to deploy mpi-mediator"
try "docker stack deploy -c $COMPOSE_FILE_PATH/docker-compose.yml $mpi_mediator_cluster_compose_param $mpi_mediator_dev_compose_param --with-registry-auth instant" "Failed to deploy mpi-mediator"
overwrite "Deploying MPI-Mediator... Done"
elif [[ "$ACTION" == "up" ]]; then
log info "Updating MPI-Mediator..."
try "docker stack deploy -c $COMPOSE_FILE_PATH/docker-compose.yml $mpi_mediator_cluster_compose_param $mpi_mediator_dev_compose_param instant" "Failed to stand up mpi-mediator"
try "docker stack deploy -c $COMPOSE_FILE_PATH/docker-compose.yml $mpi_mediator_cluster_compose_param $mpi_mediator_dev_compose_param --with-registry-auth instant" "Failed to stand up mpi-mediator"
overwrite "Updating MPI-Mediator... Done"
elif [[ "$ACTION" == "down" ]]; then
log info "Scaling MPI-Mediator down..."