mirror of https://github.com/pyodide/pyodide.git
Add sqlite3 binary to the docker image (#2807)
This commit is contained in:
parent
207bd9252e
commit
5935e5c7f9
|
@ -6,7 +6,7 @@ defaults: &defaults
|
|||
# Note: when updating the docker image version,
|
||||
# make sure there are no extra old versions lying around.
|
||||
# (e.g. `rg -F --hidden <old_tag>`)
|
||||
- image: pyodide/pyodide-env:20220525-py310-chrome102-firefox100
|
||||
- image: pyodide/pyodide-env:20220629-py310-chrome102-firefox100
|
||||
environment:
|
||||
- EMSDK_NUM_CORES: 3
|
||||
EMCC_CORES: 3
|
||||
|
|
|
@ -5,7 +5,7 @@ on:
|
|||
env:
|
||||
GHCR_REGISTRY: ghcr.io
|
||||
IMAGE_NAME: pyodide/pyodide
|
||||
PYODIDE_ENV_VERSION: 20220411-chrome99-firefox98
|
||||
PYODIDE_ENV_VERSION: 20220629-py310-chrome102-firefox100
|
||||
jobs:
|
||||
build_docker:
|
||||
runs-on: ubuntu-latest
|
||||
|
|
|
@ -8,7 +8,7 @@ RUN apt-get update \
|
|||
patch pkg-config swig unzip wget xz-utils \
|
||||
autoconf autotools-dev automake texinfo dejagnu \
|
||||
build-essential prelink autoconf libtool libltdl-dev \
|
||||
gnupg2 libdbus-glib-1-2 sudo \
|
||||
gnupg2 libdbus-glib-1-2 sudo sqlite3 \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ADD docs/requirements-doc.txt requirements.txt /
|
||||
|
|
|
@ -83,6 +83,7 @@ Additional build prerequisites are:
|
|||
- [f2c](http://www.netlib.org/f2c/)
|
||||
- [ccache](https://ccache.samba.org) (optional) _highly_ recommended for much faster rebuilds.
|
||||
- (optional) SWIG to compile NLopt
|
||||
- (optional) sqlite3 to compile libproj
|
||||
|
||||
```
|
||||
|
||||
|
@ -105,6 +106,7 @@ To build on MacOS, you need:
|
|||
GNU sed (`brew install gnu-sed`) and [re-defining them temporarily as `patch` and
|
||||
`sed`](https://formulae.brew.sh/formula/gnu-sed).
|
||||
- (optional) SWIG to compile NLopt (`brew install swig`)
|
||||
- (optional) sqlite3 to compile libproj (`brew install sqlite3`)
|
||||
|
||||
```
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
PYODIDE_IMAGE_REPO="pyodide"
|
||||
PYODIDE_IMAGE_TAG="20220525-py310-chrome102-firefox100"
|
||||
PYODIDE_IMAGE_TAG="20220629-py310-chrome102-firefox100"
|
||||
PYODIDE_PREBUILT_IMAGE_TAG="0.20.0"
|
||||
DEFAULT_PYODIDE_DOCKER_IMAGE="${PYODIDE_IMAGE_REPO}/pyodide-env:${PYODIDE_IMAGE_TAG}"
|
||||
DEFAULT_PYODIDE_SYSTEM_PORT="none"
|
||||
|
|
|
@ -40,10 +40,6 @@ check_cmake() {
|
|||
check_binary_present "cmake"
|
||||
}
|
||||
|
||||
check_libtool() {
|
||||
check_binary_present "libtool"
|
||||
}
|
||||
|
||||
check_fortran_dependencies() {
|
||||
check_binary_present "gfortran"
|
||||
check_binary_present "f2c"
|
||||
|
@ -51,6 +47,7 @@ check_fortran_dependencies() {
|
|||
|
||||
check_python_version
|
||||
check_pkgconfig
|
||||
check_cmake
|
||||
#check_python_headers
|
||||
check_fortran_dependencies
|
||||
check_shasum
|
||||
|
|
Loading…
Reference in New Issue