diff options
| -rw-r--r-- | .devcontainer/Dockerfile | 6 | ||||
| -rwxr-xr-x | configure | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 6394908e3..04a117cb2 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,17 +1,19 @@ ARG ELIXIR_VERSION FROM elixir:${ELIXIR_VERSION} +# Install SpiderMonkey 60 and tell CouchDB to use it in configure +ENV SM_VSN=60 + # Use NodeSource binaries for Node.js (Fauxton dependency) RUN set -ex; \ curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -; \ echo "deb https://deb.nodesource.com/node_10.x buster main" | tee /etc/apt/sources.list.d/nodesource.list; \ echo "deb-src https://deb.nodesource.com/node_10.x buster main" | tee -a /etc/apt/sources.list.d/nodesource.list -# Using SM 60 here so be sure to set --spidermonkey-version 60 in configure RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ - libmozjs-60-dev \ + libmozjs-${SM_VSN}-dev \ libicu-dev \ python3-venv \ python3-pip \ @@ -29,7 +29,7 @@ ERLANG_MD5="false" SKIP_DEPS=0 COUCHDB_USER="$(whoami 2>/dev/null || echo couchdb)" -SM_VSN="1.8.5" +SM_VSN=${SM_VSN:-"1.8.5"} ARCH="$(uname -m)" . ${rootdir}/version.mk |