diff --git a/.github/workflows/server-workflow.yml b/.github/workflows/server-workflow.yml index a0e7c910..ef9df604 100644 --- a/.github/workflows/server-workflow.yml +++ b/.github/workflows/server-workflow.yml @@ -86,7 +86,7 @@ jobs: runs-on: ubuntu-latest if: ${{ needs.check_python_to_js_cache.outputs.cache-hit != 'true' }} container: - image: codegram/pyodide-electionguard:pyodide-0.16.1-electionguard-1.2.1 + image: decidim/pyodide-electionguard:pyodide-0.16.1-electionguard-1.2.1 steps: - uses: actions/checkout@v2.0.0 with: diff --git a/Dockerfile.release b/Dockerfile.release index 704b7555..84111489 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -17,7 +17,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/pyodide-electionguard:pyodide-0.16.1-electionguard-1.2.1 as python-to-js-builder +FROM decidim/pyodide-electionguard:pyodide-0.16.1-electionguard-1.2.1 as python-to-js-builder LABEL author="hola@decidim.org" ENV PYODIDE_PACKAGES "electionguard,bulletin_board-electionguard" diff --git a/Dockerfile.web b/Dockerfile.web index 7983b052..bb7fbf34 100644 --- a/Dockerfile.web +++ b/Dockerfile.web @@ -17,7 +17,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/pyodide-electionguard:pyodide-0.16.1-electionguard-1.2.1 as python-to-js-builder +FROM decidim/pyodide-electionguard:pyodide-0.16.1-electionguard-1.2.1 as python-to-js-builder LABEL author="hola@decidim.org" ENV PYODIDE_PACKAGES "electionguard,bulletin_board-electionguard" diff --git a/Dockerfile.worker b/Dockerfile.worker index 79fbfd3b..5a3b34a4 100644 --- a/Dockerfile.worker +++ b/Dockerfile.worker @@ -17,7 +17,7 @@ ADD bulletin_board/server.mk /code/bulletin_board/server.mk RUN cd /code && make build_electionguard_python_wrapper # This stage builds the pyodide packages for the previous python packages -FROM codegram/pyodide-electionguard:pyodide-0.16.1-electionguard-1.2.1 as python-to-js-builder +FROM decidim/pyodide-electionguard:pyodide-0.16.1-electionguard-1.2.1 as python-to-js-builder LABEL author="hola@decidim.org" ENV PYODIDE_PACKAGES "electionguard,bulletin_board-electionguard" diff --git a/voting_schemes/electionguard/makefile.mk b/voting_schemes/electionguard/makefile.mk index 187fa735..690f742c 100644 --- a/voting_schemes/electionguard/makefile.mk +++ b/voting_schemes/electionguard/makefile.mk @@ -32,7 +32,7 @@ VOTING_SCHEME_ELECTIONGUARD_JS_LIBRARY_OUTPUT = \ VERIFIER_ELECTIONGUARD_PATH = voting_schemes/electionguard/verifier DOCKER_BASE_IMAGE = decidim/ruby-node-python-electionguard:ruby-3.1.1-node-16-python-3.8.11-electionguard-${ELECTIONGUARD_PYTHON_VERSION} -DOCKER_PYODIDE_IMAGE = codegram/pyodide-electionguard:pyodide-0.16.1-electionguard-${ELECTIONGUARD_PYTHON_VERSION} +DOCKER_PYODIDE_IMAGE = decidim/pyodide-electionguard:pyodide-0.16.1-electionguard-${ELECTIONGUARD_PYTHON_VERSION} # SPECIFIC TASKS diff --git a/voting_schemes/electionguard/python-to-js/build b/voting_schemes/electionguard/python-to-js/build index 20182888..b8525a0d 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/pyodide-electionguard:pyodide-0.16.1-electionguard-1.2.1 /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 decidim/pyodide-electionguard:pyodide-0.16.1-electionguard-1.2.1 /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/