Repository: couchdb-ci Updated Branches: refs/heads/master 101b5e47b -> 17b1b9245
Align with ASF Infra's jenkins uid/gid, fix build issues Project: http://git-wip-us.apache.org/repos/asf/couchdb-ci/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ci/commit/17b1b924 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ci/tree/17b1b924 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ci/diff/17b1b924 Branch: refs/heads/master Commit: 17b1b9245c35aaa1ecc903ebb93a4e3c98fb839c Parents: 101b5e4 Author: Joan Touzet <[email protected]> Authored: Mon May 28 14:29:35 2018 -0700 Committer: Joan Touzet <[email protected]> Committed: Mon May 28 14:29:35 2018 -0700 ---------------------------------------------------------------------- bin/apt-erlang.sh | 5 +++++ dockerfiles/centos-6 | 4 ++-- dockerfiles/centos-7 | 4 ++-- dockerfiles/debian-jessie | 4 ++-- dockerfiles/debian-stretch | 4 ++-- dockerfiles/ubuntu-bionic | 4 ++-- dockerfiles/ubuntu-trusty | 4 ++-- dockerfiles/ubuntu-xenial | 4 ++-- files/debian.profile | 2 +- files/ubuntu.profile | 2 +- 10 files changed, 21 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/17b1b924/bin/apt-erlang.sh ---------------------------------------------------------------------- diff --git a/bin/apt-erlang.sh b/bin/apt-erlang.sh index c4c4437..15abb01 100755 --- a/bin/apt-erlang.sh +++ b/bin/apt-erlang.sh @@ -55,5 +55,10 @@ else apt-get update && apt-get install -y esl-erlang=1:${ERLANGVERSION} fi +# dangling symlinks cause make release to fail. +# so, we remove the manpage symlink +# see endless complaints about this on GH issues, SO, etc. +rm /usr/lib/erlang/man + # clean up apt-get clean http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/17b1b924/dockerfiles/centos-6 ---------------------------------------------------------------------- diff --git a/dockerfiles/centos-6 b/dockerfiles/centos-6 index ff81d11..b1dc177 100644 --- a/dockerfiles/centos-6 +++ b/dockerfiles/centos-6 @@ -28,8 +28,8 @@ ARG erlangversion=19.3.6 ARG nodeversion=8 # Create Jenkins user and group -RUN groupadd --gid 12036 jenkins; \ - useradd --uid 10025 --gid jenkins --create-home jenkins +RUN groupadd --gid 910 jenkins; \ + useradd --uid 910 --gid jenkins --create-home jenkins # Copy couchdb-ci repo into root's home directory ADD --chown=root:root bin /root/couchdb-ci/bin/ http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/17b1b924/dockerfiles/centos-7 ---------------------------------------------------------------------- diff --git a/dockerfiles/centos-7 b/dockerfiles/centos-7 index b8fcffc..5c3bc26 100644 --- a/dockerfiles/centos-7 +++ b/dockerfiles/centos-7 @@ -28,8 +28,8 @@ ARG erlangversion=19.3.6 ARG nodeversion=8 # Create Jenkins user and group -RUN groupadd --gid 12036 jenkins; \ - useradd --uid 10025 --gid jenkins --create-home jenkins +RUN groupadd --gid 910 jenkins; \ + useradd --uid 910 --gid jenkins --create-home jenkins # Copy couchdb-ci repo into root's home directory ADD --chown=root:root bin /root/couchdb-ci/bin/ http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/17b1b924/dockerfiles/debian-jessie ---------------------------------------------------------------------- diff --git a/dockerfiles/debian-jessie b/dockerfiles/debian-jessie index 21d153a..f4260a2 100644 --- a/dockerfiles/debian-jessie +++ b/dockerfiles/debian-jessie @@ -28,8 +28,8 @@ ARG erlangversion=19.3.6 ARG nodeversion=8 # Create Jenkins user and group -RUN groupadd --gid 12036 jenkins; \ - useradd --uid 10025 --gid jenkins --create-home jenkins +RUN groupadd --gid 910 jenkins; \ + useradd --uid 910 --gid jenkins --create-home jenkins # Copy couchdb-ci repo into root's home directory ADD --chown=root:root bin /root/couchdb-ci/bin/ http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/17b1b924/dockerfiles/debian-stretch ---------------------------------------------------------------------- diff --git a/dockerfiles/debian-stretch b/dockerfiles/debian-stretch index ff111df..56cd5d7 100644 --- a/dockerfiles/debian-stretch +++ b/dockerfiles/debian-stretch @@ -28,8 +28,8 @@ ARG erlangversion=19.3.6 ARG nodeversion=8 # Create Jenkins user and group -RUN groupadd --gid 12036 jenkins; \ - useradd --uid 10025 --gid jenkins --create-home jenkins +RUN groupadd --gid 910 jenkins; \ + useradd --uid 910 --gid jenkins --create-home jenkins # Copy couchdb-ci repo into root's home directory ADD --chown=root:root bin /root/couchdb-ci/bin/ http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/17b1b924/dockerfiles/ubuntu-bionic ---------------------------------------------------------------------- diff --git a/dockerfiles/ubuntu-bionic b/dockerfiles/ubuntu-bionic index c82418e..ef6dab7 100644 --- a/dockerfiles/ubuntu-bionic +++ b/dockerfiles/ubuntu-bionic @@ -28,8 +28,8 @@ ARG erlangversion=19.3.6 ARG nodeversion=8 # Create Jenkins user and group -RUN groupadd --gid 12036 jenkins; \ - useradd --uid 10025 --gid jenkins --create-home jenkins +RUN groupadd --gid 910 jenkins; \ + useradd --uid 910 --gid jenkins --create-home jenkins # Copy couchdb-ci repo into root's home directory ADD --chown=root:root bin /root/couchdb-ci/bin/ http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/17b1b924/dockerfiles/ubuntu-trusty ---------------------------------------------------------------------- diff --git a/dockerfiles/ubuntu-trusty b/dockerfiles/ubuntu-trusty index 4107203..574c466 100644 --- a/dockerfiles/ubuntu-trusty +++ b/dockerfiles/ubuntu-trusty @@ -28,8 +28,8 @@ ARG erlangversion=19.3.6 ARG nodeversion=8 # Create Jenkins user and group -RUN groupadd --gid 12036 jenkins; \ - useradd --uid 10025 --gid jenkins --create-home jenkins +RUN groupadd --gid 910 jenkins; \ + useradd --uid 910 --gid jenkins --create-home jenkins # Copy couchdb-ci repo into root's home directory ADD --chown=root:root bin /root/couchdb-ci/bin/ http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/17b1b924/dockerfiles/ubuntu-xenial ---------------------------------------------------------------------- diff --git a/dockerfiles/ubuntu-xenial b/dockerfiles/ubuntu-xenial index 8661be5..cb5111a 100644 --- a/dockerfiles/ubuntu-xenial +++ b/dockerfiles/ubuntu-xenial @@ -28,8 +28,8 @@ ARG erlangversion=19.3.6 ARG nodeversion=8 # Create Jenkins user and group -RUN groupadd --gid 12036 jenkins; \ - useradd --uid 10025 --gid jenkins --create-home jenkins +RUN groupadd --gid 910 jenkins; \ + useradd --uid 910 --gid jenkins --create-home jenkins # Copy couchdb-ci repo into root's home directory ADD --chown=root:root bin /root/couchdb-ci/bin/ http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/17b1b924/files/debian.profile ---------------------------------------------------------------------- diff --git a/files/debian.profile b/files/debian.profile index 4a7788c..92ad186 100644 --- a/files/debian.profile +++ b/files/debian.profile @@ -1,3 +1,3 @@ Profile: couchdb/main Extends: debian/main -Disable-Tags: dir-or-file-in-opt, source-is-missing, non-etc-file-marked-as-conffile, embedded-library, duplicate-font-file, embedded-javascript-library +Disable-Tags: dir-or-file-in-opt, source-is-missing, non-etc-file-marked-as-conffile, embedded-library, duplicate-font-file, embedded-javascript-library, depends-on-essential-package-without-using-version http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/17b1b924/files/ubuntu.profile ---------------------------------------------------------------------- diff --git a/files/ubuntu.profile b/files/ubuntu.profile index b4520cb..9327298 100644 --- a/files/ubuntu.profile +++ b/files/ubuntu.profile @@ -1,3 +1,3 @@ Profile: couchdb/main Extends: ubuntu/main -Disable-Tags: dir-or-file-in-opt, source-is-missing, non-etc-file-marked-as-conffile +Disable-Tags: dir-or-file-in-opt, source-is-missing, non-etc-file-marked-as-conffile, embedded-library, depends-on-essential-package-without-using-version
