[couchdb-docker] 01/01: separately parametrize SM version

[wo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch parametrize-spidermonkey
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git

commit 5d98da66d31923a6931af690d6778787ac36472d
Author: Joan Touzet <wo...@apache.org>
AuthorDate: Thu Feb 13 09:03:31 2020 -0800

    separately parametrize SM version
---
 dev/Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev/Dockerfile b/dev/Dockerfile
index 4f4cdce..30af98b 100644
--- a/dev/Dockerfile
+++ b/dev/Dockerfile
@@ -120,7 +120,7 @@ RUN set -ex; \
 ARG clone_url=https://github.com/apache/couchdb.git
 RUN git clone $clone_url /usr/src/couchdb
 WORKDIR /usr/src/couchdb
-RUN ./configure -c --spidermonkey-version 60
+RUN ./configure
 
 # This layer performs the actual build of a relocatable, self-contained
 # release of CouchDB. It pulls down the latest changes from the remote
@@ -129,12 +129,13 @@ RUN ./configure -c --spidermonkey-version 60
 FROM build_dependencies AS build
 
 ARG checkout_branch=master
-ARG configure_options="-c --spidermonkey-version 60"
+ARG configure_options
+ARG spidermonkey_version=60
 
 WORKDIR /usr/src/couchdb/
 RUN git fetch origin \
     && git checkout $checkout_branch \
-    && ./configure $configure_options \
+    && ./configure $configure_options --spidermonkey-version $spidermonkey_version\
     && make release
 
 # This results in a single layer image (or at least skips the build stuff?)