chore: fix run one use case workflow docker (#688)

zama-ai · May 22, 2024 · 4314718 · 4314718
1 parent f864407
commit 4314718
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 12 deletions.
diff --git a/.github/workflows/run_one_use_cases_example.yaml b/.github/workflows/run_one_use_cases_example.yaml
@@ -68,11 +68,28 @@ jobs:
       run:
         shell: bash
     steps:
-
-      - name: Set up Environment
+      - name: Install Docker and Dependencies
         run: |
-          # Setup commands if any, for example, installing dependencies, etc.
-          apt-get update && apt-get install -y python3-venv make git git-lfs binutils
+          export DEBIAN_FRONTEND=noninteractive
+          apt-get update
+          apt-get install -y \
+            ca-certificates \
+            curl \
+            gnupg \
+            lsb-release \
+            python3-venv \
+            make \
+            git \
+            git-lfs \
+            binutils
+          mkdir -p /etc/apt/keyrings
+          curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+          echo \
+            "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
+            $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+          apt-get update
+          apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
+          apt-get install -y python3-venv make git git-lfs binutils
 
       - name: Checkout Code
         uses: actions/checkout@v4
@@ -81,7 +98,8 @@ jobs:
 
       - name: Run One Use Case Example Script
         run: |
-          make run_one_use_case_example USE_CASE=${{ github.event.inputs.use_case }}
+          USE_CASE=${{ github.event.inputs.use_case }}
+          make run_one_use_case_example USE_CASE=$USE_CASE
 
   stop-runner-linux:
     name: Stop EC2 runner

diff --git a/.github/workflows/run_use_cases_examples.yaml b/.github/workflows/run_use_cases_examples.yaml
@@ -47,11 +47,28 @@ jobs:
       run:
         shell: bash
     steps:
-
-      - name: Set up Environment
+      - name: Install Docker and Dependencies
         run: |
-          # Setup commands if any, for example, installing dependencies, etc.
-          apt-get update && apt-get install -y python3-venv make git git-lfs binutils
+          export DEBIAN_FRONTEND=noninteractive
+          apt-get update
+          apt-get install -y \
+            ca-certificates \
+            curl \
+            gnupg \
+            lsb-release \
+            python3-venv \
+            make \
+            git \
+            git-lfs \
+            binutils
+          mkdir -p /etc/apt/keyrings
+          curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+          echo \
+            "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
+            $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+          apt-get update
+          apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
+          apt-get install -y python3-venv make git git-lfs binutils
 
       - name: Checkout Code
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633

diff --git a/use_case_examples/deployment/breast_cancer/Makefile b/use_case_examples/deployment/breast_cancer/Makefile
@@ -4,7 +4,7 @@ one:
 	@./train_with_docker.sh
 
 two: one
-	@python -m concrete.ml.deployment.deploy_to_docker --only-build
+	@python ../server/deploy_to_docker.py --only-build
 
 three: two
 	@python build_docker_client_image.py
diff --git a/use_case_examples/deployment/cifar/Makefile b/use_case_examples/deployment/cifar/Makefile
@@ -4,7 +4,7 @@ one:
 	@python compile_with_docker.py
 
 two: one
-	@python -m concrete.ml.deployment.deploy_to_docker --only-build
+	@python ../server/deploy_to_docker.py --only-build
 
 three: two
 	@docker build --tag cifar_client -f Dockerfile.client .
diff --git a/use_case_examples/deployment/sentiment_analysis/Makefile b/use_case_examples/deployment/sentiment_analysis/Makefile
@@ -4,7 +4,7 @@ one:
 	@python compile_with_docker.py
 
 two: one
-	@python -m concrete.ml.deployment.deploy_to_docker --only-build
+	@python ../server/deploy_to_docker.py --only-build
 
 three: two
 	@docker build --tag cifar_client -f Dockerfile.client .