You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2020/01/31 19:16:02 UTC
[couchdb-docker] 01/01: dev: debian-buster, node 10, SM60
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch 3.0.0-prep
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 981efd6b0c1d21e2af2ffa112806c4d3588eac12
Author: Joan Touzet <wo...@apache.org>
AuthorDate: Fri Jan 31 11:15:51 2020 -0800
dev: debian-buster, node 10, SM60
---
dev-cluster/Dockerfile | 16 ++++++++--------
dev/Dockerfile | 16 ++++++++--------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dev-cluster/Dockerfile b/dev-cluster/Dockerfile
index 609c70b..70e3bfb 100644
--- a/dev-cluster/Dockerfile
+++ b/dev-cluster/Dockerfile
@@ -12,7 +12,7 @@
# Base layer containing dependencies needed at runtime. This layer will be
# cached after the initial build.
-FROM debian:stretch
+FROM debian:buster
MAINTAINER CouchDB Developers dev@couchdb.apache.org
@@ -25,8 +25,8 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
dirmngr \
gnupg \
haproxy \
- libicu57 \
- libmozjs185-1.0 \
+ libicu63 \
+ libmozjs-60-0 \
openssl && \
rm -rf /var/lib/apt/lists/*
@@ -80,7 +80,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
git \
libcurl4-openssl-dev \
libicu-dev \
- libmozjs185-dev \
+ libmozjs-60-dev \
python3 \
libpython3-dev \
python3-pip \
@@ -96,8 +96,8 @@ RUN pip3 install --upgrade \
# Node is special
RUN set -ex; \
curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -; \
- echo 'deb https://deb.nodesource.com/node_8.x stretch main' > /etc/apt/sources.list.d/nodesource.list; \
- echo 'deb-src https://deb.nodesource.com/node_8.x stretch main' >> /etc/apt/sources.list.d/nodesource.list; \
+ echo 'deb https://deb.nodesource.com/node_10.x buster main' > /etc/apt/sources.list.d/nodesource.list; \
+ echo 'deb-src https://deb.nodesource.com/node_10.x buster main' >> /etc/apt/sources.list.d/nodesource.list; \
apt-get update -y && apt-get install -y nodejs; \
npm install -g grunt-cli
@@ -106,10 +106,10 @@ RUN set -ex; \
ARG clone_url=https://gitbox.apache.org/repos/asf/couchdb.git
RUN git clone $clone_url /usr/src/couchdb
WORKDIR /usr/src/couchdb
-RUN ./configure
+RUN ./configure -c --spidermonkey-version 60
ARG checkout_branch=master
-ARG configure_options
+ARG configure_options="-c --spidermonkey-version 60"
WORKDIR /usr/src/couchdb/
RUN git fetch origin \
diff --git a/dev/Dockerfile b/dev/Dockerfile
index 4a48d64..4f4cdce 100644
--- a/dev/Dockerfile
+++ b/dev/Dockerfile
@@ -12,7 +12,7 @@
# Base layer containing dependencies needed at runtime. This layer will be
# cached after the initial build.
-FROM debian:stretch as runtime
+FROM debian:buster as runtime
MAINTAINER CouchDB Developers dev@couchdb.apache.org
@@ -25,7 +25,7 @@ RUN apt-get update -y && apt-get install -y \
curl \
dirmngr \
gnupg \
- libicu57 \
+ libicu63 \
libssl1.1 \
openssl \
&& echo "deb https://apache.bintray.com/couchdb-deb stretch main" \
@@ -38,7 +38,7 @@ RUN apt-get update -y && apt-get install -y \
gpg --batch --keyserver $server --recv-keys 8756C4F765C9AC3CB6B85D62379CE192D401AB61 && break || : ; \
done \
&& gpg -a --export 8756C4F765C9AC3CB6B85D62379CE192D401AB61 > /etc/apt/trusted.gpg.d/couchdb.gpg.asc \
- && apt-get update -y && apt-get install -y --no-install-recommends couch-libmozjs185-1.0 \
+ && apt-get update -y && apt-get install -y --no-install-recommends libmozjs-60-0 \
&& rm -rf /var/lib/apt/lists/*
# grab gosu for easy step-down from root and tini for signal handling
@@ -89,7 +89,7 @@ FROM runtime AS build_dependencies
RUN apt-get update -y && apt-get install -y --no-install-recommends \
build-essential \
- couch-libmozjs185-dev \
+ libmozjs-60-dev \
erlang-nox \
erlang-reltool \
erlang-dev \
@@ -111,8 +111,8 @@ RUN pip3 install --upgrade \
# Node is special
RUN set -ex; \
curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -; \
- echo 'deb https://deb.nodesource.com/node_8.x stretch main' > /etc/apt/sources.list.d/nodesource.list; \
- echo 'deb-src https://deb.nodesource.com/node_8.x stretch main' >> /etc/apt/sources.list.d/nodesource.list; \
+ echo 'deb https://deb.nodesource.com/node_10.x buster main' > /etc/apt/sources.list.d/nodesource.list; \
+ echo 'deb-src https://deb.nodesource.com/node_10.x buster main' >> /etc/apt/sources.list.d/nodesource.list; \
apt-get update -y && apt-get install -y nodejs; \
npm install -g grunt-cli
@@ -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
+RUN ./configure -c --spidermonkey-version 60
# This layer performs the actual build of a relocatable, self-contained
# release of CouchDB. It pulls down the latest changes from the remote
@@ -129,7 +129,7 @@ RUN ./configure
FROM build_dependencies AS build
ARG checkout_branch=master
-ARG configure_options
+ARG configure_options="-c --spidermonkey-version 60"
WORKDIR /usr/src/couchdb/
RUN git fetch origin \