update wedpr-site image (#180)

* update mpc generator

* update wedpr-site image

Author: cyjseagull

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* \

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"

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"

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 [email protected]
 
+# 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"]
+ENTRYPOINT ["/bin/bash", "/data/home/wedpr/wedpr-site/start.sh", "true"]

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 ========="

docker-files/site/depends/requirements.txt

@@ -0,0 +1,2 @@
+sqlparse~=0.4.1
+sqlvalidator==0.0.17

python/mpc_generator/mpc_generator/_version.py

@@ -20,7 +20,7 @@ def run(self):
 setup_args = dict(
     name='wedpr_mpc_generator',
     packages=find_packages(),
-    version="1.0.0.dev",
+    version="1.0.0.dev-20241206",
     description="wedpr-mpc-generator: The mpc generator for WeDPR",
     long_description_content_type="text/markdown",
     author="WeDPR Development Team",