diff options
| author | Adam <kocolosk@apache.org> | 2021-01-17 19:36:06 -0500 |
|---|---|---|
| committer | Adam <kocolosk@apache.org> | 2021-01-17 20:14:51 -0500 |
| commit | 9120ba21efafc0e1fc08028a280719d6bfc58af5 (patch) | |
| tree | 968f44b6959bd7e818577b64d09cf669b1f7b625 | |
| parent | 700d3cfce6a6dd43a763605b306e2fde8c62ae12 (diff) | |
| download | couchdb-9120ba21efafc0e1fc08028a280719d6bfc58af5.tar.gz | |
Parameterize the elixir version
| -rw-r--r-- | .devcontainer/Dockerfile | 6 | ||||
| -rw-r--r-- | .devcontainer/devcontainer.json | 15 |
2 files changed, 16 insertions, 5 deletions
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index da4ea6219..6394908e3 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,5 +1,5 @@ -# Based on erlang:22 (we need elixir for the test suite) -FROM elixir:1.10 +ARG ELIXIR_VERSION +FROM elixir:${ELIXIR_VERSION} # Use NodeSource binaries for Node.js (Fauxton dependency) RUN set -ex; \ @@ -19,4 +19,4 @@ RUN set -ex; \ nodejs # Documentation theme -RUN pip3 install sphinx_rtd_theme
\ No newline at end of file +RUN pip3 install sphinx_rtd_theme diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index d38d43741..666f9fa16 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,8 +1,19 @@ { "build": { - "dockerfile": "Dockerfile" + "dockerfile": "Dockerfile", + "args": { + // Useful choices include: + // 1.11 -> Erlang 23, Debian Buster + // 1.10 -> Erlang 22, Debian Buster + // 1.9 -> Erlang 22, Debian Buster + // + // Older versions based on Debian Stretch will not include + // SpiderMonkey 60, which the Dockerfile expects to be able + // to install via apt-get. + "ELIXIR_VERSION": "1.10" + } }, "extensions": [ "erlang-ls.erlang-ls" ] -}
\ No newline at end of file +} |