Repository: couchdb-ci Updated Branches: refs/heads/master eceb98d86 -> cd4cc55f1
Add support for Debian 9 aka. stretch Closes #3 Project: http://git-wip-us.apache.org/repos/asf/couchdb-ci/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ci/commit/a4df1f23 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ci/tree/a4df1f23 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ci/diff/a4df1f23 Branch: refs/heads/master Commit: a4df1f232b595d24761e2bbfa138b07bba9f929e Parents: a9b33ef Author: Robert Haist <[email protected]> Authored: Sat Sep 30 14:01:20 2017 +0200 Committer: Robert Haist <[email protected]> Committed: Sat Sep 30 20:40:32 2017 +0200 ---------------------------------------------------------------------- README.md | 2 +- ansible/debian-9-base.yml | 26 +++++++++++++++ ansible/debian-9-erlang-18.3.yml | 24 ++++++++++++++ ansible/debian-9-erlang-default.yml | 22 +++++++++++++ ansible/roles/debian-9/tasks/main.yml | 7 +++++ ansible/roles/debian-9/vars/main.yml | 2 ++ bin/debian-9-base/create-container.sh | 28 +++++++++++++++++ bin/debian-9-base/enter-container.sh | 20 ++++++++++++ bin/debian-9-base/publish-container.sh | 20 ++++++++++++ bin/debian-9-erlang-18.3/create-container.sh | 28 +++++++++++++++++ bin/debian-9-erlang-18.3/enter-container.sh | 20 ++++++++++++ bin/debian-9-erlang-18.3/publish-container.sh | 20 ++++++++++++ .../run-build-in-container.sh | 24 ++++++++++++++ bin/debian-9-erlang-default/create-container.sh | 28 +++++++++++++++++ bin/debian-9-erlang-default/enter-container.sh | 20 ++++++++++++ .../publish-container.sh | 20 ++++++++++++ .../run-build-in-container.sh | 24 ++++++++++++++ dockerfiles/debian-9-base | 33 ++++++++++++++++++++ dockerfiles/debian-9-erlang-18.3 | 32 +++++++++++++++++++ dockerfiles/debian-9-erlang-default | 32 +++++++++++++++++++ jenkins/build.sh | 4 +++ 21 files changed, 435 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a4df1f23/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 4d9727f..2232376 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ for the origins of this work. **Ubuntu 14.04** | â (16B03-1) | â **Ubuntu 16.04** | â (18.3) | â **Debian 8** | â (17.3) | â -**Debian 9** | - | - +**Debian 9** | â (19.2) | â **CentOS 6** | â (R14B04) | â **CentOS 7** | â (16B03-1) | â **macOS 10.12** | - | - http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a4df1f23/ansible/debian-9-base.yml ---------------------------------------------------------------------- diff --git a/ansible/debian-9-base.yml b/ansible/debian-9-base.yml new file mode 100644 index 0000000..9d96747 --- /dev/null +++ b/ansible/debian-9-base.yml @@ -0,0 +1,26 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +- hosts: couchdb-ci-worker + remote_user: root + roles: + - debian-9 + - { role: nodesource.node, nodejs_version: '6.x' } + - dependencies-debian + - lintian-debian + - common + - spidermonkey http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a4df1f23/ansible/debian-9-erlang-18.3.yml ---------------------------------------------------------------------- diff --git a/ansible/debian-9-erlang-18.3.yml b/ansible/debian-9-erlang-18.3.yml new file mode 100644 index 0000000..3d83d92 --- /dev/null +++ b/ansible/debian-9-erlang-18.3.yml @@ -0,0 +1,24 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +- hosts: couchdb-ci-worker + vars: + erlang_solutions_pkg_ver: "1:18.3-1" + remote_user: root + roles: + - debian-9 + - erlang-esl-debian-pkgs http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a4df1f23/ansible/debian-9-erlang-default.yml ---------------------------------------------------------------------- diff --git a/ansible/debian-9-erlang-default.yml b/ansible/debian-9-erlang-default.yml new file mode 100644 index 0000000..8b6c4bf --- /dev/null +++ b/ansible/debian-9-erlang-default.yml @@ -0,0 +1,22 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +- hosts: couchdb-ci-worker + remote_user: root + roles: + - debian-9 + - erlang-default-debian http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a4df1f23/ansible/roles/debian-9/tasks/main.yml ---------------------------------------------------------------------- diff --git a/ansible/roles/debian-9/tasks/main.yml b/ansible/roles/debian-9/tasks/main.yml new file mode 100644 index 0000000..3637c90 --- /dev/null +++ b/ansible/roles/debian-9/tasks/main.yml @@ -0,0 +1,7 @@ +# dependencies for making Debian/RPM repositories +- name: install packages required to build Debian/RPM repositories + apt: name={{item}} state=present install_recommends=no + with_items: + - reprepro + - createrepo + http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a4df1f23/ansible/roles/debian-9/vars/main.yml ---------------------------------------------------------------------- diff --git a/ansible/roles/debian-9/vars/main.yml b/ansible/roles/debian-9/vars/main.yml new file mode 100644 index 0000000..e541907 --- /dev/null +++ b/ansible/roles/debian-9/vars/main.yml @@ -0,0 +1,2 @@ +erlang_solutions_key_url: http://packages.erlang-solutions.com/debian/erlang_solutions.asc +erlang_solutions_apt_repo_url: deb http://packages.erlang-solutions.com/debian stretch contrib http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a4df1f23/bin/debian-9-base/create-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-9-base/create-container.sh b/bin/debian-9-base/create-container.sh new file mode 100644 index 0000000..67a4ab8 --- /dev/null +++ b/bin/debian-9-base/create-container.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -e + +# The Docker containers need the root directory of this repository as their +# build context (because they need the Ansible files). +pushd `dirname $0`/../.. > /dev/null + +docker build -f dockerfiles/debian-9-base -t couchdbdev/debian-9-base . + +popd > /dev/null http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a4df1f23/bin/debian-9-base/enter-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-9-base/enter-container.sh b/bin/debian-9-base/enter-container.sh new file mode 100644 index 0000000..9c34c80 --- /dev/null +++ b/bin/debian-9-base/enter-container.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +docker run -it couchdbdev/debian-9-base bash http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a4df1f23/bin/debian-9-base/publish-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-9-base/publish-container.sh b/bin/debian-9-base/publish-container.sh new file mode 100644 index 0000000..b0a8d43 --- /dev/null +++ b/bin/debian-9-base/publish-container.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +docker push couchdbdev/debian-9-base http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a4df1f23/bin/debian-9-erlang-18.3/create-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-9-erlang-18.3/create-container.sh b/bin/debian-9-erlang-18.3/create-container.sh new file mode 100644 index 0000000..a83d85c --- /dev/null +++ b/bin/debian-9-erlang-18.3/create-container.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -e + +# The Docker containers need the root directory of this repository as their +# build context (because they need the Ansible files). +pushd `dirname $0`/../.. > /dev/null + +docker build -f dockerfiles/debian-9-erlang-18.3 -t couchdbdev/debian-9-erlang-18.3 . + +popd > /dev/null http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a4df1f23/bin/debian-9-erlang-18.3/enter-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-9-erlang-18.3/enter-container.sh b/bin/debian-9-erlang-18.3/enter-container.sh new file mode 100644 index 0000000..37471b9 --- /dev/null +++ b/bin/debian-9-erlang-18.3/enter-container.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +docker run -it couchdbdev/debian-9-erlang-18.3 bash http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a4df1f23/bin/debian-9-erlang-18.3/publish-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-9-erlang-18.3/publish-container.sh b/bin/debian-9-erlang-18.3/publish-container.sh new file mode 100644 index 0000000..9e87bb1 --- /dev/null +++ b/bin/debian-9-erlang-18.3/publish-container.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +docker push couchdbdev/debian-9-erlang-18.3 http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a4df1f23/bin/debian-9-erlang-18.3/run-build-in-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-9-erlang-18.3/run-build-in-container.sh b/bin/debian-9-erlang-18.3/run-build-in-container.sh new file mode 100644 index 0000000..e6081a3 --- /dev/null +++ b/bin/debian-9-erlang-18.3/run-build-in-container.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -e +pushd $( dirname "$0" )/../.. +pwd +OS=debian-9 ERLANG=18.3 jenkins/build.sh +popd http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a4df1f23/bin/debian-9-erlang-default/create-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-9-erlang-default/create-container.sh b/bin/debian-9-erlang-default/create-container.sh new file mode 100644 index 0000000..0fc40e0 --- /dev/null +++ b/bin/debian-9-erlang-default/create-container.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -e + +# The Docker containers need the root directory of this repository as their +# build context (because they need the Ansible files). +pushd `dirname $0`/../.. > /dev/null + +docker build -f dockerfiles/debian-9-erlang-default -t couchdbdev/debian-9-erlang-default . + +popd > /dev/null http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a4df1f23/bin/debian-9-erlang-default/enter-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-9-erlang-default/enter-container.sh b/bin/debian-9-erlang-default/enter-container.sh new file mode 100644 index 0000000..eb9b1a4 --- /dev/null +++ b/bin/debian-9-erlang-default/enter-container.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +docker run -it couchdbdev/debian-9-erlang-default bash http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a4df1f23/bin/debian-9-erlang-default/publish-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-9-erlang-default/publish-container.sh b/bin/debian-9-erlang-default/publish-container.sh new file mode 100644 index 0000000..8b2f34c --- /dev/null +++ b/bin/debian-9-erlang-default/publish-container.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +docker push couchdbdev/debian-9-erlang-default http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a4df1f23/bin/debian-9-erlang-default/run-build-in-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-9-erlang-default/run-build-in-container.sh b/bin/debian-9-erlang-default/run-build-in-container.sh new file mode 100644 index 0000000..88a762c --- /dev/null +++ b/bin/debian-9-erlang-default/run-build-in-container.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -e +pushd $( dirname "$0" )/../.. +pwd +OS=debian-9 ERLANG=default jenkins/build.sh +popd http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a4df1f23/dockerfiles/debian-9-base ---------------------------------------------------------------------- diff --git a/dockerfiles/debian-9-base b/dockerfiles/debian-9-base new file mode 100644 index 0000000..8d86dbf --- /dev/null +++ b/dockerfiles/debian-9-base @@ -0,0 +1,33 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations + +# NOTE: All docker files need to be run from ../../, that is +# docker build -f /docker/<container>/Dockerfile + +# Base Image: Plain Vanilla Debian with Ansible installed +FROM williamyeh/ansible:debian9-onbuild + +# Add ansible directory and cd to it +ADD ./ansible /ansible +WORKDIR /ansible + +# Install Ansible roles +RUN ansible-galaxy install nodesource.node + +# Run Ansible to provision Debian base container +RUN ansible-playbook debian-9-base.yml \ + --connection=local \ + --inventory-file=./inventory/couchdb-ci-worker http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a4df1f23/dockerfiles/debian-9-erlang-18.3 ---------------------------------------------------------------------- diff --git a/dockerfiles/debian-9-erlang-18.3 b/dockerfiles/debian-9-erlang-18.3 new file mode 100644 index 0000000..90cdc87 --- /dev/null +++ b/dockerfiles/debian-9-erlang-18.3 @@ -0,0 +1,32 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations + +# NOTE: All docker files need to be run from ../../, that is +# docker build -f /docker/<container>/Dockerfile + +FROM couchdbdev/debian-9-base:latest + +# Re-add ansible directory to pick up latest changes +# This avoids having to cascade rebuild all images when changing +# a role that only affects a child container +ADD ./ansible /ansible + +# Run Ansible to provision container with Erlang 18.3 +RUN ansible-playbook debian-9-erlang-18.3.yml \ + --connection=local \ + --inventory-file=./inventory/couchdb-ci-worker + +USER build http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a4df1f23/dockerfiles/debian-9-erlang-default ---------------------------------------------------------------------- diff --git a/dockerfiles/debian-9-erlang-default b/dockerfiles/debian-9-erlang-default new file mode 100644 index 0000000..1ac2140 --- /dev/null +++ b/dockerfiles/debian-9-erlang-default @@ -0,0 +1,32 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations + +# NOTE: All docker files need to be run from ../../, that is +# docker build -f /docker/<container>/Dockerfile + +FROM couchdbdev/debian-9-base:latest + +# Re-add ansible directory to pick up latest changes +# This avoids having to cascade rebuild all images when changing +# a role that only affects a child container +ADD ./ansible /ansible + +# Run Ansible to provision container with Debian's default Erlang +RUN ansible-playbook debian-9-erlang-default.yml \ + --connection=local \ + --inventory-file=./inventory/couchdb-ci-worker + +USER build http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a4df1f23/jenkins/build.sh ---------------------------------------------------------------------- diff --git a/jenkins/build.sh b/jenkins/build.sh index 9b8fbc6..001d576 100755 --- a/jenkins/build.sh +++ b/jenkins/build.sh @@ -52,6 +52,10 @@ case $OS in echo "Using Debian 8" DOCKER_IMAGE=$DOCKER_IMAGE"debian-8-" ;; + debian-9*) + echo "Using Debian 9" + DOCKER_IMAGE=$DOCKER_IMAGE"debian-9-" + ;; ubuntu-12.04*) echo "Using Ubuntu 12.04" DOCKER_IMAGE=$DOCKER_IMAGE"ubuntu-12.04-"
