From e504a0600b60367b2be50281817aa378719bf1d7 Mon Sep 17 00:00:00 2001
From: cyjseagull <yujiechen_hust@163.com>
Date: Fri, 6 Dec 2024 17:01:10 +0800
Subject: [PATCH] update wedpr-site image

---
 docker-files/base/Dockerfile               |  2 +-
 docker-files/base/build.sh                 |  7 +++++++
 docker-files/jupyter/build.sh              |  7 +++++++
 docker-files/site/Dockerfile               | 10 +++++++++-
 docker-files/site/build.sh                 | 16 ++++++++++++++++
 docker-files/site/depends/requirements.txt |  2 ++
 6 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 docker-files/base/build.sh
 create mode 100644 docker-files/jupyter/build.sh
 create mode 100644 docker-files/site/build.sh
 create mode 100644 docker-files/site/depends/requirements.txt

diff --git a/docker-files/base/Dockerfile b/docker-files/base/Dockerfile
index 8297b199..bb258491 100644
--- a/docker-files/base/Dockerfile
+++ b/docker-files/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04 as wedpr_image
+FROM ubuntu:18.04 as wedpr-image
 
 # install python and java
 RUN apt-get update && apt-get install -y tzdata language-pack-zh* \
diff --git a/docker-files/base/build.sh b/docker-files/base/build.sh
new file mode 100644
index 00000000..00aa37b9
--- /dev/null
+++ b/docker-files/base/build.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+echo "* build image: wedpr-image"
+
+docker build -t wedpr-image .
+
+echo "* build image: wedpr-image success"
\ No newline at end of file
diff --git a/docker-files/jupyter/build.sh b/docker-files/jupyter/build.sh
new file mode 100644
index 00000000..a3aea37e
--- /dev/null
+++ b/docker-files/jupyter/build.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+echo "* build image: wedpr-jupyter-image"
+
+docker build -t wedpr-jupyter-image .
+
+echo "* build image: wedpr-jupyter-image success"
\ No newline at end of file
diff --git a/docker-files/site/Dockerfile b/docker-files/site/Dockerfile
index c118a2e1..ecef5604 100644
--- a/docker-files/site/Dockerfile
+++ b/docker-files/site/Dockerfile
@@ -32,7 +32,15 @@ ENTRYPOINT ["/bin/bash", "/data/home/wedpr/wedpr-pir/start.sh", "true"]
 FROM wedpr-image:latest as wedpr-site
 LABEL maintainer service@webank.com
 
+# install the requirements
+COPY depends/requirements.txt /root/requirements.txt
+# install the requirements
+RUN pip install --no-cache-dir -i https://pypi.mirrors.ustc.edu.cn/simple/ -r root/requirements.txt
+
+# TODO: use the non-test pip after uploaded
+RUN pip install --no-cache-dir -i https://test.pypi.org/simple/ wedpr_mpc_generator
+
 RUN mkdir -p /data/home/wedpr
 COPY --from=builder /WeDPR/wedpr-site/dist/ /data/home/wedpr/wedpr-site
 # TODO: fetch the web package from github tag
-ENTRYPOINT ["/bin/bash", "/data/home/wedpr/wedpr-site/start.sh", "true"]
\ No newline at end of file
+ENTRYPOINT ["/bin/bash", "/data/home/wedpr/wedpr-site/start.sh", "true"]
diff --git a/docker-files/site/build.sh b/docker-files/site/build.sh
new file mode 100644
index 00000000..391b59fb
--- /dev/null
+++ b/docker-files/site/build.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+echo "========= BUILD IMAGES for WEDPR, BRANCH: ${1} ========="
+echo "* build image: wedpr-jupyter-worker"
+docker build --target wedpr-jupyter-worker --build-arg SOURCE_BRANCH=${1} -t wedpr-jupyter-worker .
+echo "* build image: wedpr-jupyter-worker success"
+
+
+echo "* build image: wedpr-pir"
+docker build --target wedpr-pir --build-arg SOURCE_BRANCH=${1} -t wedpr-pir .
+echo "* build image: wedpr-pir success"
+
+echo "* build image: wedpr-site"
+docker build --target wedpr-site --build-arg SOURCE_BRANCH=${1} -t wedpr-site .
+echo "* build image: wedpr-site success"
+
+echo "========= BUILD IMAGES for WEDPR, BRANCH: ${1} success ========="
\ No newline at end of file
diff --git a/docker-files/site/depends/requirements.txt b/docker-files/site/depends/requirements.txt
new file mode 100644
index 00000000..ba221cc0
--- /dev/null
+++ b/docker-files/site/depends/requirements.txt
@@ -0,0 +1,2 @@
+sqlparse~=0.4.1
+sqlvalidator==0.0.17
\ No newline at end of file