From 1a687293d2e9dcf1ba0235350aa71127567aaea8 Mon Sep 17 00:00:00 2001 From: "Shah, Karan" Date: Fri, 18 Oct 2024 15:26:46 +0530 Subject: [PATCH] [openfl-docker] Remove startup script dependency Signed-off-by: Shah, Karan --- .github/workflows/dockerization.yml | 9 +++------ openfl-docker/Makefile | 6 ------ openfl-docker/start_actor_in_container.sh | 14 -------------- 3 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 openfl-docker/Makefile delete mode 100755 openfl-docker/start_actor_in_container.sh diff --git a/.github/workflows/dockerization.yml b/.github/workflows/dockerization.yml index 2ffc005b94..ee60d056e1 100644 --- a/.github/workflows/dockerization.yml +++ b/.github/workflows/dockerization.yml @@ -86,13 +86,10 @@ jobs: docker run --rm \ --network host \ --mount type=bind,source=./cert_agg.tar,target=/certs.tar \ - -e CONTAINER_TYPE=aggregator \ - example_workspace /home/openfl/openfl-docker/start_actor_in_container.sh & - + example_workspace bash -c "tar -xf /certs.tar && fx aggregator start" & + # TODO: Run with two collaborators instead. docker run --rm \ --network host \ --mount type=bind,source=./cert_col_charlie.tar,target=/certs.tar \ - -e CONTAINER_TYPE=collaborator \ - -e COL=charlie \ - example_workspace /home/openfl/openfl-docker/start_actor_in_container.sh + example_workspace bash -c "tar -xf /certs.tar && fx collaborator certify --import agg_to_col_charlie_signed_cert.zip && fx collaborator start -n charlie" \ No newline at end of file diff --git a/openfl-docker/Makefile b/openfl-docker/Makefile deleted file mode 100644 index ea6b414ef0..0000000000 --- a/openfl-docker/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -build: - @docker build --pull -t openfl -f Dockerfile.base .. -run: - @docker run --rm -it --network host openfl -save: - @docker save openfl | gzip > openfl.tar.gz diff --git a/openfl-docker/start_actor_in_container.sh b/openfl-docker/start_actor_in_container.sh deleted file mode 100755 index 587426ede3..0000000000 --- a/openfl-docker/start_actor_in_container.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -set -m - -if [ $CONTAINER_TYPE = 'collaborator' ] -then - tar -xf /certs.tar - fx collaborator certify --import agg_to_col_${COL}_signed_cert.zip - fx --log-level debug collaborator start -n ${COL} - -elif [ $CONTAINER_TYPE = 'aggregator' ] -then - tar -xf /certs.tar - fx --log-level debug aggregator start -fi