diff --git a/Dockerfile.release b/Dockerfile.release index 976f2f8a9..0e14ae3ba 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -12,7 +12,7 @@ ADD voting_schemes/electionguard/python-wrapper /code/voting_schemes/electiongua RUN cd /code && make build_electionguard_python_wrapper # This stage builds the pyodide packages for the previous python packages -FROM codegram/electionguard-pyodide-base-packages:0.0.2 as python-to-js-builder +FROM codegram/electionguard-pyodide-base-packages:0.0.3 as python-to-js-builder LABEL author="david@codegram.com" ENV PYODIDE_PACKAGES "electionguard,bulletin_board-electionguard" diff --git a/Dockerfile.web b/Dockerfile.web index 3ee87bc24..666e13140 100644 --- a/Dockerfile.web +++ b/Dockerfile.web @@ -12,7 +12,7 @@ ADD voting_schemes/electionguard/python-wrapper /code/voting_schemes/electiongua RUN cd /code && make build_electionguard_python_wrapper # This stage builds the pyodide packages for the previous python packages -FROM codegram/electionguard-pyodide-base-packages:0.0.2 as python-to-js-builder +FROM codegram/electionguard-pyodide-base-packages:0.0.3 as python-to-js-builder LABEL author="david@codegram.com" ENV PYODIDE_PACKAGES "electionguard,bulletin_board-electionguard" diff --git a/voting_schemes/electionguard/pyodide-base-packages/Dockerfile b/voting_schemes/electionguard/pyodide-base-packages/Dockerfile index ab944567d..73ea6ffdf 100644 --- a/voting_schemes/electionguard/pyodide-base-packages/Dockerfile +++ b/voting_schemes/electionguard/pyodide-base-packages/Dockerfile @@ -1,4 +1,4 @@ -FROM iodide/pyodide:0.17.0a2 +FROM codegram/pyodide:latest LABEL author="david@codegram.com" ENV PYODIDE_PACKAGES "pyasn1,libgmp,gmpy2,micropip,attrs,sortedcontainers,hypothesis,jsons,typish,rsa" diff --git a/voting_schemes/electionguard/python-to-js/build b/voting_schemes/electionguard/python-to-js/build index 3a6ec32e6..b05797521 100755 --- a/voting_schemes/electionguard/python-to-js/build +++ b/voting_schemes/electionguard/python-to-js/build @@ -19,7 +19,7 @@ rm -rf $SHARED_FOLDER/electionguard/* cp -rf .. $SHARED_FOLDER/electionguard/ # Build packages with Pyodide -docker run --rm --mount type=bind,source=$HOST_SHARED_FOLDER/electionguard,target=/electionguard -e PYODIDE_PACKAGES="electionguard,bulletin_board-electionguard" -it codegram/electionguard-pyodide-base-packages:0.0.2 /electionguard/python-to-js/build-pyodide +docker run --rm --mount type=bind,source=$HOST_SHARED_FOLDER/electionguard,target=/electionguard -e PYODIDE_PACKAGES="electionguard,bulletin_board-electionguard" -it codegram/electionguard-pyodide-base-packages:0.0.3 /electionguard/python-to-js/build-pyodide # Move generated files to the vendor folder of the js-adapter cp -rf $SHARED_FOLDER/electionguard/python-to-js/output/* ../ruby-adapter/public/assets/electionguard/