This is an automated email from the ASF dual-hosted git repository. kocolosk pushed a commit to branch drop-obsoleete-distros-and-travis in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git
commit d3492ea6c0bd8b0e13ad86393737deeba545e85d Author: Adam Kocoloski <[email protected]> AuthorDate: Sat Jan 15 07:29:39 2022 -0500 Remove leftovers from other obsolete distros --- bin/apt-dependencies.sh | 2 +- dockerfiles/centos-6 | 60 ----------------------------------------------- dockerfiles/ubuntu-trusty | 56 ------------------------------------------- 3 files changed, 1 insertion(+), 117 deletions(-) diff --git a/bin/apt-dependencies.sh b/bin/apt-dependencies.sh index e4d4c65..f8b6394 100755 --- a/bin/apt-dependencies.sh +++ b/bin/apt-dependencies.sh @@ -42,7 +42,7 @@ apt-get update && apt-get install --no-install-recommends -y lsb-release SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" . ${SCRIPTPATH}/detect-arch.sh >/dev/null . ${SCRIPTPATH}/detect-os.sh >/dev/null -debians='(wheezy|jessie|stretch|buster)' +debians='(jessie|stretch|buster)' ubuntus='(bionic|focal)' echo "Detected Ubuntu/Debian version: ${VERSION_CODENAME} arch: ${ARCH}" diff --git a/dockerfiles/centos-6 b/dockerfiles/centos-6 deleted file mode 100644 index cb1a2c1..0000000 --- a/dockerfiles/centos-6 +++ /dev/null @@ -1,60 +0,0 @@ -# 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: These are intended to be built using the arguments as -# described in ../build.sh. See that script for more details. - -FROM centos:6 - -# Choose whether to install SpiderMonkey 1.8.5, default yes -ARG js=js -# Choose whether to install Erlang, default yes -ARG erlang=erlang -# Select version of Node, Erlang and Elixir to install -ARG erlangversion=20.3.8.26-1 -ARG elixirversion=v1.9.4 -ARG nodeversion=14 - -# Create Jenkins user and group -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/ -ADD --chown=root:root files /root/couchdb-ci/files/ - -# Jenkins builds in /usr/src/couchdb. -RUN mkdir -p /usr/src/couchdb; \ - chown -R jenkins:jenkins /usr/src/couchdb - -# Add /usr/local/lib to global LD_LIBRARY_PATH for CentOS -RUN echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf - -# Install all dependencies, and optionally SM 1.8.5 -# This allows us to use the same Dockerfile for building SM -RUN ERLANGVERSION=$erlangversion \ - ELIXIRVERSION=$elixirversion \ - NODEVERSION=$nodeversion \ - /root/couchdb-ci/bin/install-dependencies.sh $js $erlang - -# Allow Jenkins to sudo -RUN echo "jenkins ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/jenkins - -USER jenkins - -# overwrite this with 'CMD []' in a dependent Dockerfile -CMD ["/bin/bash"] - diff --git a/dockerfiles/ubuntu-trusty b/dockerfiles/ubuntu-trusty deleted file mode 100644 index 323b167..0000000 --- a/dockerfiles/ubuntu-trusty +++ /dev/null @@ -1,56 +0,0 @@ -# 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: These are intended to be built using the arguments as -# described in ../build.sh. See that script for more details. - -FROM ubuntu:trusty - -# Choose whether to install SpiderMonkey 1.8.5, default yes -ARG js=js -# Choose whether to install Erlang, default yes -ARG erlang=erlang -# Select version of Node, Erlang and Elixir to install -ARG erlangversion=20.3.8.26-1 -ARG elixirversion=v1.9.4 -ARG nodeversion=14 - -# Create Jenkins user and group -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/ -ADD --chown=root:root files /root/couchdb-ci/files/ - -# Jenkins builds in /usr/src/couchdb. -RUN mkdir -p /usr/src/couchdb; \ - chown -R jenkins:jenkins /usr/src/couchdb - -# Install all dependencies, and optionally SM 1.8.5 -# This allows us to use the same Dockerfile for building SM -RUN ERLANGVERSION=$erlangversion \ - ELIXIRVERSION=$elixirversion \ - NODEVERSION=$nodeversion \ - /root/couchdb-ci/bin/install-dependencies.sh $js $erlang - -# Allow Jenkins to sudo -RUN echo "jenkins ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/jenkins - -USER jenkins - -# overwrite this with 'CMD []' in a dependent Dockerfile -CMD ["/bin/bash"]
