Rooba
/
pyodide
mirror of https://github.com/pyodide/pyodide.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use newer docker image in run_docker (#848)

This commit is contained in:
Dexter Chua 2020-12-12 18:31:53 +08:00 committed by GitHub
parent f7511aed85
commit 03447f9fff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/Makefile
View File

@ -2,7 +2,7 @@ PYODIDE_ROOT=$(abspath ..)
PYODIDE_LIBRARIES=$(abspath ./.artifacts) PYODIDE_LIBRARIES=$(abspath ./.artifacts)
include ../Makefile.envs include ../Makefile.envs
all: deps all:
mkdir -p $(PYODIDE_LIBRARIES) mkdir -p $(PYODIDE_LIBRARIES)
PYTHONPATH=$(PYODIDE_LIBRARIES)/lib/python ../bin/pyodide buildall . ../build \ PYTHONPATH=$(PYODIDE_LIBRARIES)/lib/python ../bin/pyodide buildall . ../build \
--package_abi=$(PYODIDE_PACKAGE_ABI) --target=$(TARGETPYTHONROOT) --only $(PYODIDE_PACKAGES) --install-dir $(PYODIDE_LIBRARIES) --package_abi=$(PYODIDE_PACKAGE_ABI) --target=$(TARGETPYTHONROOT) --only $(PYODIDE_PACKAGES) --install-dir $(PYODIDE_LIBRARIES)
@ -12,10 +12,6 @@ update-all:
../bin/pyodide mkpkg "$${pkg}" --update; \ ../bin/pyodide mkpkg "$${pkg}" --update; \
done done
deps:
# Install build dependencies
$(HOSTPYTHON) -m pip install "Cython<0.30.0" Tempita
clean: clean:
rm -rf ./*/build ./*/build.log rm -rf ./*/build ./*/build.log
rm -rf ./.artifacts rm -rf ./.artifacts

2
run_docker
View File

@ -26,7 +26,7 @@ function error() {
} }
PYODIDE_IMAGE_TAG="8" PYODIDE_IMAGE_TAG="9"
PYODIDE_PREBUILT_IMAGE_TAG="0.16.0b1" PYODIDE_PREBUILT_IMAGE_TAG="0.16.0b1"
DEFAULT_PYODIDE_DOCKER_IMAGE="iodide/pyodide-env:${PYODIDE_IMAGE_TAG}" DEFAULT_PYODIDE_DOCKER_IMAGE="iodide/pyodide-env:${PYODIDE_IMAGE_TAG}"
DEFAULT_PYODIDE_SYSTEM_PORT="8000" DEFAULT_PYODIDE_SYSTEM_PORT="8000"