Skip to content
Permalink
Browse files
Add debian buster, drop debian jessie, lintian fixes (#49)
  • Loading branch information
wohali committed Aug 22, 2019
1 parent aef6969 commit 1e87d2ad068f3c8d458612b8275123eab91a1ff7
Showing 9 changed files with 39 additions and 34 deletions.
@@ -16,12 +16,12 @@ env:
- TARBALL_URL=https://dist.apache.org/repos/dist/release/couchdb/source/2.3.1/apache-couchdb-2.3.1.tar.gz
- TARBALL=apache-couchdb-2.3.1.tar.gz
matrix:
- TARGET="js debian-jessie"
- TARGET="couch debian-jessie ${TARBALL_URL}"
- TARGET="js debian-stretch"
- TARGET="couch debian-stretch ${TARBALL_URL}"
- ERLANGVERSION=20.3.8.20 TARGET="js aarch64-debian-stretch"
- ERLANGVERSION=20.3.8.20 TARGET="couch aarch64-debian-stretch ${TARBALL_URL}"
- ERLANGVERSION=20.3.8.22-1 TARGET="js debian-buster"
- ERLANGVERSION=20.3.8.22-1 TARGET="couch debian-buster ${TARBALL_URL}"
- TARGET="js ubuntu-xenial"
- TARGET="couch ubuntu-xenial ${TARBALL_URL}"
- TARGET="js ubuntu-bionic"
@@ -49,6 +49,16 @@ aarch64-debian-stretch: DIST=debian-stretch
aarch64-debian-stretch: debian-no-lintian
stretch: debian

# Debian 10
debian-buster: PLATFORM=buster
debian-buster: DIST=debian-buster
debian-buster: buster
# Lintian doesn't install correctly into a cross-built Docker container ?!
aarch64-debian-buster: PLATFORM=buster
aarch64-debian-buster: DIST=debian-buster
aarch64-debian-buster: debian-no-lintian
buster: debian


# Ubuntu 12.04
ubuntu-precise: PLATFORM=precise
@@ -43,29 +43,30 @@ make copy-couch $(lsb_release -cs) COUCHTARBALL=path/to/couchdb-#.#.#.tar.gz PLA

## Building inside the `couchdbdev` docker containers

You must first pull down the image or images you need from Docker Hub, or build the images using the [apache/couchdb-ci](https://github.com/apache/couchdb-ci) repository. Example:

```shell
docker pull couchdbdev/<osname>-<codename>-erlang-<erlang-version>
```

A full list of supported environments is at https://hub.docker.com/u/couchdbdev/ .
You must first pull down the image or images you need from Docker Hub, or build the images
using the [apache/couchdb-ci](https://github.com/apache/couchdb-ci) repository. A full
list of supported environments is at https://hub.docker.com/u/couchdbdev/ .

### SpiderMonkey 1.8.5

```shell
docker pull couchdbdev/<os>-<codename>-base
./build.sh js <os>-<codename> # for example, debian-stretch, ubuntu-bionic or centos-7.
```

### CouchDB

From a downloaded CouchDB tarball:

```shell
./build.sh couch <os>-<codename> path/to/couchdb-#.#.#.tar.gz
docker pull couchdbdev/<osname>-<codename>-erlang-<erlang-version>
ERLANGVERSION=<erlang-version> ./build.sh couch <os>-<codename> path/to/couchdb-#.#.#.tar.gz
```

or, if you want to build directly from the Apache distribution repository,
Directly from the Apache source CDN:

```shell
docker pull couchdbdev/<osname>-<codename>-erlang-<erlang-version>
./build.sh couch <os>-<codename> https://dist.apache.org/repos/dist/release/couchdb/source/#.#.#/apache-couchdb-#.#.#.tar.gz
```

@@ -29,9 +29,9 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

# TODO derive these by interrogating the Docker repo rather tha
# hard coding the list
DEBIANS="debian-jessie debian-stretch aarch64-debian-stretch"
DEBIANS="debian-stretch aarch64-debian-stretch debian-buster aarch64-debian-buster"
UBUNTUS="ubuntu-trusty ubuntu-xenial ubuntu-bionic"
debs="(debian-jessie|debian-stretch|aarch64-debian-stretch|ubuntu-trusty|ubuntu-xenial|ubuntu-bionic)"
debs="(debian-stretch|aarch64-debian-stretch|debian-buster|aarch64-debian-buster|ubuntu-trusty|ubuntu-xenial|ubuntu-bionic)"

CENTOSES="centos-6 centos-7"
rpms="(centos-6|centos-7)"
@@ -12,3 +12,6 @@ couchdb: script-not-executable opt/couchdb/lib/couch-2.0.0/priv/spawnkillable/co
# And we want to be extra sure our license is not ignored
couchdb: extra-license-file opt/couchdb/LICENSE

# and our doc base won't move out of /opt, sorry
couchdb: doc-base-file-references-wrong-path couchdb:8 /opt/couchdb/share/www/docs/index.html
couchdb: doc-base-file-references-wrong-path couchdb:9 /opt/couchdb/share/www/docs/*
@@ -134,7 +134,8 @@ case $1 in
# Hack to make the upgrade from the 1.0.1 Ubuntu package more correct:
chown root:root /etc/couchdb
chown root:root /etc/couchdb/default.ini
chown -R root:root /etc/couchdb/default.d
chown root:root /etc/couchdb/default.d
chown root:root /etc/couchdb/default.d/*
chmod 755 /etc/couchdb
chmod 644 /etc/couchdb/default.ini
chmod 755 /etc/couchdb/default.d
@@ -186,9 +187,16 @@ case $1 in
esac

# These should be owned by the couchdb user and group:
chown -R couchdb:couchdb /opt/couchdb/etc
chown -R couchdb:couchdb /var/lib/couchdb
chown -R couchdb:couchdb /var/log/couchdb
chown couchdb:couchdb /opt/couchdb/etc
chown couchdb:couchdb /opt/couchdb/etc/* >/dev/null 2>&1 || true
chown couchdb:couchdb /var/lib/couchdb
chown couchdb:couchdb /var/lib/couchdb/* >/dev/null 2>&1 || true
chown couchdb:couchdb /var/lib/couchdb/shards/* >/dev/null 2>&1 || true
chown couchdb:couchdb /var/lib/couchdb/shards/*/* >/dev/null 2>&1 || true
chown couchdb:couchdb /var/lib/couchdb/.shards/* >/dev/null 2>&1 || true
chown couchdb:couchdb /var/lib/couchdb/.shards/*/* >/dev/null 2>&1 || true
chown couchdb:couchdb /var/log/couchdb
chown couchdb:couchdb /var/log/couchdb/* >/dev/null 2>&1 || true
# These should also not be world readable or writable:
find /opt/couchdb/etc -name *.ini -exec chmod 0640 {} \;
chmod a+x /opt/couchdb/bin/couchup

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 1e87d2a

Please sign in to comment.