Skip to content
Permalink
Browse files
Multiple build system improvements (#200)
  • Loading branch information
wohali committed Mar 23, 2021
1 parent e3ca492 commit 44dc5167b74c5db49cbbeab808494cf37ac615c9
Showing 16 changed files with 53 additions and 719 deletions.
@@ -0,0 +1,2 @@
*~
*.swp
@@ -13,7 +13,6 @@ services:
env:
- RELEASES=2.3.1
- RELEASES=2.3.1-ubi
- RELEASES=3.0.1
- RELEASES=3.1.1
- RELEASES=3.1.1-ubi
- RELEASES=dev

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations under
# the License.

FROM debian:stretch-slim
FROM debian:buster-slim

LABEL maintainer="CouchDB Developers dev@couchdb.apache.org"

@@ -30,47 +30,11 @@ RUN set -ex; \

# grab gosu for easy step-down from root and tini for signal handling and zombie reaping
# see https://github.com/apache/couchdb-docker/pull/28#discussion_r141112407
ENV GOSU_VERSION 1.11
ENV TINI_VERSION 0.18.0
RUN set -ex; \
\
RUN set -eux; \
apt-get update; \
apt-get install -y --no-install-recommends wget; \
apt-get install -y --no-install-recommends gosu tini; \
rm -rf /var/lib/apt/lists/*; \
\
dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
\
# install gosu
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-$dpkgArch"; \
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
export GNUPGHOME="$(mktemp -d)"; \
echo "disable-ipv6" >> ${GNUPGHOME}/dirmngr.conf; \
for server in $(shuf -e pgpkeys.mit.edu \
ha.pool.sks-keyservers.net \
hkp://p80.pool.sks-keyservers.net:80 \
pgp.mit.edu) ; do \
gpg --batch --keyserver $server --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && break || : ; \
done; \
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
chmod +x /usr/local/bin/gosu; \
gosu nobody true; \
\
# install tini
wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-$dpkgArch"; \
wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-$dpkgArch.asc"; \
export GNUPGHOME="$(mktemp -d)"; \
echo "disable-ipv6" >> ${GNUPGHOME}/dirmngr.conf; \
for server in $(shuf -e pgpkeys.mit.edu \
ha.pool.sks-keyservers.net \
hkp://p80.pool.sks-keyservers.net:80 \
pgp.mit.edu) ; do \
gpg --batch --keyserver $server --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \
done; \
gpg --batch --verify /usr/local/bin/tini.asc /usr/local/bin/tini; \
rm -rf "$GNUPGHOME" /usr/local/bin/tini.asc; \
chmod +x /usr/local/bin/tini; \
apt-get purge -y --auto-remove wget; \
tini --version

# http://docs.couchdb.org/en/latest/install/unix.html#installing-the-apache-couchdb-packages
@@ -83,6 +47,7 @@ RUN set -xe; \
for server in $(shuf -e pgpkeys.mit.edu \
ha.pool.sks-keyservers.net \
hkp://p80.pool.sks-keyservers.net:80 \
hkps://hkps.pool.sks-keyservers.net \
pgp.mit.edu) ; do \
gpg --batch --keyserver $server --recv-keys $GPG_COUCH_KEY && break || : ; \
done; \
@@ -91,9 +56,9 @@ RUN set -xe; \
rm -rf "$GNUPGHOME"; \
apt-key list

ENV COUCHDB_VERSION 2.3.1
ENV COUCHDB_VERSION 2.3.1-1

RUN echo "deb https://apache.bintray.com/couchdb-deb stretch main" > /etc/apt/sources.list.d/couchdb.list
RUN echo "deb https://apache.bintray.com/couchdb-deb buster main" > /etc/apt/sources.list.d/couchdb.list

# https://github.com/apache/couchdb-pkg/blob/master/debian/README.Debian
RUN set -xe; \
@@ -102,7 +67,7 @@ RUN set -xe; \
echo "couchdb couchdb/mode select none" | debconf-set-selections; \
# we DO want recommends this time
DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-downgrades --allow-remove-essential --allow-change-held-packages \
couchdb="$COUCHDB_VERSION"~stretch \
couchdb="$COUCHDB_VERSION"~buster \
; \
# Undo symlinks to /var/log and /var/lib
rmdir /var/lib/couchdb /var/log/couchdb; \

This file was deleted.

0 comments on commit 44dc516

Please sign in to comment.