Merge branch 'develop' into fix-python-wrapper

# Conflicts:
#	Dockerfile.release

voting_schemes/electionguard/docker/pyodide-electionguard/Dockerfile

@@ -3,6 +3,9 @@ LABEL author="[email protected]"
 
 ENV PYODIDE_PACKAGES "pyasn1,libgmp,gmpy2,micropip,attrs,sortedcontainers,hypothesis,jsons,typish,rsa"
 
+# Install system dependencies
+RUN apt-get update --allow-releaseinfo-change && apt-get install -y libgnutls28-dev
+
 # Add base packages meta files
 ADD packages /packages
 

voting_schemes/electionguard/makefile.mk

@@ -39,14 +39,23 @@ DOCKER_PYODIDE_IMAGE = decidim/pyodide-electionguard:pyodide-0.16.1-electionguar
 electionguard_submodules:
 	git submodule init && git submodule update
 
-electionguard_docker_base:
-	docker image build --build-arg ELECTIONGUARD_PYTHON_REF=${ELECTIONGUARD_PYTHON_VERSION} -t ${DOCKER_BASE_IMAGE} ${ELECTIONGUARD_DOCKER_PATH}/ruby-node-python-electionguard && \
+electionguard_docker_base: build_electionguard_docker_base \
+	push_electionguard_docker_base
+
+build_electionguard_docker_base:
+	docker image build --build-arg ELECTIONGUARD_PYTHON_REF=${ELECTIONGUARD_PYTHON_VERSION} -t ${DOCKER_BASE_IMAGE} ${ELECTIONGUARD_DOCKER_PATH}/ruby-node-python-electionguard
+
+push_electionguard_docker_base:
 	docker image push ${DOCKER_BASE_IMAGE}
 
-electionguard_docker_pyodide:
-	docker image build -t ${DOCKER_PYODIDE_IMAGE} ${ELECTIONGUARD_DOCKER_PATH}/pyodide-electionguard && \
-	docker image push ${DOCKER_PYODIDE_IMAGE}
+electionguard_docker_pyodide: build_electionguard_docker_pyodide \
+	push_electionguard_docker_pyodide
 
+build_electionguard_docker_pyodide:
+	docker image build -t ${DOCKER_PYODIDE_IMAGE} ${ELECTIONGUARD_DOCKER_PATH}/pyodide-electionguard
+
+push_electionguard_docker_pyodide:
+	docker image push ${DOCKER_PYODIDE_IMAGE}
 
 # COMMON TASKS