Repository: bigtop Updated Branches: refs/heads/master b7edb367c -> 20a774e06
BIGTOP-2651: Delete obsolete docker images and build files Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/3f8eb648 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/3f8eb648 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/3f8eb648 Branch: refs/heads/master Commit: 3f8eb64850aaf91a9e6570105fe79deef07a9e5d Parents: b7edb36 Author: Olaf Flebbe <[email protected]> Authored: Fri Dec 30 18:21:40 2016 +0100 Committer: Olaf Flebbe <[email protected]> Committed: Fri Dec 30 18:26:04 2016 +0100 ---------------------------------------------------------------------- bigtop_toolchain/bin/puppetize.sh | 9 +---- .../ubuntu-15.04-ppc64le/Dockerfile | 35 -------------------- .../bigtop-deploy/ubuntu-15.04-ppc64le/build.sh | 18 ---------- docker/bigtop-puppet/fedora-20/Dockerfile | 20 ----------- docker/bigtop-puppet/fedora-20/build.sh | 16 --------- docker/bigtop-puppet/opensuse-13.2/Dockerfile | 20 ----------- docker/bigtop-puppet/opensuse-13.2/build.sh | 16 --------- .../ubuntu-15.04-ppc64le/Dockerfile | 20 ----------- .../bigtop-puppet/ubuntu-15.04-ppc64le/build.sh | 16 --------- docker/bigtop-puppet/ubuntu-15.04/Dockerfile | 20 ----------- docker/bigtop-puppet/ubuntu-15.04/build.sh | 16 --------- docker/bigtop-slaves/fedora-20/Dockerfile | 22 ------------ docker/bigtop-slaves/opensuse-13.2/Dockerfile | 22 ------------ .../ubuntu-15.04-ppc64le/Dockerfile | 22 ------------ docker/bigtop-slaves/ubuntu-15.04/Dockerfile | 22 ------------ 15 files changed, 1 insertion(+), 293 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/3f8eb648/bigtop_toolchain/bin/puppetize.sh ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/bin/puppetize.sh b/bigtop_toolchain/bin/puppetize.sh index 4e3fdaa..a9d7798 100755 --- a/bigtop_toolchain/bin/puppetize.sh +++ b/bigtop_toolchain/bin/puppetize.sh @@ -31,13 +31,6 @@ else fi case ${ID}-${VERSION_ID} in - fedora-20*) - # Work around issue in fedora:20 docker image - yum -y install yum-utils; yum-config-manager --enable updates-testing - rpm -ivh https://yum.puppetlabs.com/puppetlabs-release-fedora-20.noarch.rpm - yum update - yum -y install hostname curl sudo unzip wget puppet - ;; fedora-25*) dnf -y install yum-utils dnf -y update @@ -54,7 +47,7 @@ case ${ID}-${VERSION_ID} in fi apt-get -y install curl sudo unzip puppet software-properties-common ;; - ubuntu-1[56]*) + ubuntu-*) apt-get update apt-get -y install curl sudo unzip wget puppet software-properties-common ;; http://git-wip-us.apache.org/repos/asf/bigtop/blob/3f8eb648/docker/bigtop-deploy/ubuntu-15.04-ppc64le/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-deploy/ubuntu-15.04-ppc64le/Dockerfile b/docker/bigtop-deploy/ubuntu-15.04-ppc64le/Dockerfile deleted file mode 100644 index f91283a..0000000 --- a/docker/bigtop-deploy/ubuntu-15.04-ppc64le/Dockerfile +++ /dev/null @@ -1,35 +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 under the License. - -FROM bigtop/puppet:ubuntu-15.04-ppc64le -MAINTAINER Amir Sanjar - -COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain - -# enable ssh -RUN apt-get update && \ - apt-get install -y openssh-server vim && \ - mkdir -p /var/run/sshd && \ - # requiretty off - sed -i.bak 's/requiretty/!requiretty/' /etc/sudoers && \ - # setup vagrant account - mkdir -p /root/.ssh && \ - chmod 0700 /root/.ssh && \ - wget http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub --no-check-certificate -O /root/.ssh/authorized_keys && \ - chmod 0600 /root/.ssh/authorized_keys && \ - # Install required Puppet modules - puppet apply -e "include bigtop_toolchain::puppet-modules" - -CMD /usr/sbin/sshd -D http://git-wip-us.apache.org/repos/asf/bigtop/blob/3f8eb648/docker/bigtop-deploy/ubuntu-15.04-ppc64le/build.sh ---------------------------------------------------------------------- diff --git a/docker/bigtop-deploy/ubuntu-15.04-ppc64le/build.sh b/docker/bigtop-deploy/ubuntu-15.04-ppc64le/build.sh deleted file mode 100755 index c8647a4..0000000 --- a/docker/bigtop-deploy/ubuntu-15.04-ppc64le/build.sh +++ /dev/null @@ -1,18 +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 under the License. - -cp -r ../../../bigtop_toolchain . -docker build -t bigtop/deploy:ubuntu-15.04-ppc64le . -rm -rf bigtop_toolchain http://git-wip-us.apache.org/repos/asf/bigtop/blob/3f8eb648/docker/bigtop-puppet/fedora-20/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-puppet/fedora-20/Dockerfile b/docker/bigtop-puppet/fedora-20/Dockerfile deleted file mode 100644 index 271c7ac..0000000 --- a/docker/bigtop-puppet/fedora-20/Dockerfile +++ /dev/null @@ -1,20 +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 under the License. -FROM fedora:20 -MAINTAINER [email protected] - -COPY puppetize.sh /tmp/puppetize.sh - -RUN bash /tmp/puppetize.sh http://git-wip-us.apache.org/repos/asf/bigtop/blob/3f8eb648/docker/bigtop-puppet/fedora-20/build.sh ---------------------------------------------------------------------- diff --git a/docker/bigtop-puppet/fedora-20/build.sh b/docker/bigtop-puppet/fedora-20/build.sh deleted file mode 100755 index 37801fa..0000000 --- a/docker/bigtop-puppet/fedora-20/build.sh +++ /dev/null @@ -1,16 +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 under the License. -cp ../../../bigtop_toolchain/bin/puppetize.sh . -docker build -t bigtop/puppet:fedora-20 . http://git-wip-us.apache.org/repos/asf/bigtop/blob/3f8eb648/docker/bigtop-puppet/opensuse-13.2/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-puppet/opensuse-13.2/Dockerfile b/docker/bigtop-puppet/opensuse-13.2/Dockerfile deleted file mode 100644 index 9c41f63..0000000 --- a/docker/bigtop-puppet/opensuse-13.2/Dockerfile +++ /dev/null @@ -1,20 +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 under the License. -FROM opensuse:13.2 -MAINTAINER [email protected] - -COPY puppetize.sh /tmp/puppetize.sh - -RUN bash /tmp/puppetize.sh http://git-wip-us.apache.org/repos/asf/bigtop/blob/3f8eb648/docker/bigtop-puppet/opensuse-13.2/build.sh ---------------------------------------------------------------------- diff --git a/docker/bigtop-puppet/opensuse-13.2/build.sh b/docker/bigtop-puppet/opensuse-13.2/build.sh deleted file mode 100755 index 049c62a..0000000 --- a/docker/bigtop-puppet/opensuse-13.2/build.sh +++ /dev/null @@ -1,16 +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 under the License. -cp ../../../bigtop_toolchain/bin/puppetize.sh . -docker build -t bigtop/puppet:opensuse-13.2 . http://git-wip-us.apache.org/repos/asf/bigtop/blob/3f8eb648/docker/bigtop-puppet/ubuntu-15.04-ppc64le/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-puppet/ubuntu-15.04-ppc64le/Dockerfile b/docker/bigtop-puppet/ubuntu-15.04-ppc64le/Dockerfile deleted file mode 100755 index 34269e5..0000000 --- a/docker/bigtop-puppet/ubuntu-15.04-ppc64le/Dockerfile +++ /dev/null @@ -1,20 +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 under the License. -FROM ppc64le/ubuntu:15.04 -MAINTAINER Amir Sanjar - -COPY puppetize.sh /tmp/puppetize.sh - -RUN bash /tmp/puppetize.sh http://git-wip-us.apache.org/repos/asf/bigtop/blob/3f8eb648/docker/bigtop-puppet/ubuntu-15.04-ppc64le/build.sh ---------------------------------------------------------------------- diff --git a/docker/bigtop-puppet/ubuntu-15.04-ppc64le/build.sh b/docker/bigtop-puppet/ubuntu-15.04-ppc64le/build.sh deleted file mode 100755 index f0def13..0000000 --- a/docker/bigtop-puppet/ubuntu-15.04-ppc64le/build.sh +++ /dev/null @@ -1,16 +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 under the License. -cp ../../../bigtop_toolchain/bin/puppetize.sh . -docker build -t bigtop/puppet:ubuntu-15.04-ppc64le . http://git-wip-us.apache.org/repos/asf/bigtop/blob/3f8eb648/docker/bigtop-puppet/ubuntu-15.04/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-puppet/ubuntu-15.04/Dockerfile b/docker/bigtop-puppet/ubuntu-15.04/Dockerfile deleted file mode 100644 index 5ac6c75..0000000 --- a/docker/bigtop-puppet/ubuntu-15.04/Dockerfile +++ /dev/null @@ -1,20 +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 under the License. -FROM ubuntu:15.04 -MAINTAINER Amir Sanjar - -COPY puppetize.sh /tmp/puppetize.sh - -RUN bash /tmp/puppetize.sh http://git-wip-us.apache.org/repos/asf/bigtop/blob/3f8eb648/docker/bigtop-puppet/ubuntu-15.04/build.sh ---------------------------------------------------------------------- diff --git a/docker/bigtop-puppet/ubuntu-15.04/build.sh b/docker/bigtop-puppet/ubuntu-15.04/build.sh deleted file mode 100755 index ea239fc..0000000 --- a/docker/bigtop-puppet/ubuntu-15.04/build.sh +++ /dev/null @@ -1,16 +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 under the License. -cp ../../../bigtop_toolchain/bin/puppetize.sh . -docker build -t bigtop/puppet:ubuntu-15.04 . http://git-wip-us.apache.org/repos/asf/bigtop/blob/3f8eb648/docker/bigtop-slaves/fedora-20/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-slaves/fedora-20/Dockerfile b/docker/bigtop-slaves/fedora-20/Dockerfile deleted file mode 100644 index dd1e9f4..0000000 --- a/docker/bigtop-slaves/fedora-20/Dockerfile +++ /dev/null @@ -1,22 +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 under the License. -FROM bigtop/puppet:fedora-20 -MAINTAINER [email protected] - -COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain - -RUN puppet apply -e "include bigtop_toolchain::installer" -COPY . /tmp/bigtop -RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/bigtop http://git-wip-us.apache.org/repos/asf/bigtop/blob/3f8eb648/docker/bigtop-slaves/opensuse-13.2/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-slaves/opensuse-13.2/Dockerfile b/docker/bigtop-slaves/opensuse-13.2/Dockerfile deleted file mode 100644 index 0c35b34..0000000 --- a/docker/bigtop-slaves/opensuse-13.2/Dockerfile +++ /dev/null @@ -1,22 +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 under the License. -FROM bigtop/puppet:opensuse-13.2 -MAINTAINER [email protected] - -COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain - -RUN puppet apply -e "include bigtop_toolchain::installer" -COPY . /tmp/bigtop -RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/bigtop http://git-wip-us.apache.org/repos/asf/bigtop/blob/3f8eb648/docker/bigtop-slaves/ubuntu-15.04-ppc64le/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-slaves/ubuntu-15.04-ppc64le/Dockerfile b/docker/bigtop-slaves/ubuntu-15.04-ppc64le/Dockerfile deleted file mode 100644 index 995412a..0000000 --- a/docker/bigtop-slaves/ubuntu-15.04-ppc64le/Dockerfile +++ /dev/null @@ -1,22 +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 under the License. -FROM bigtop/puppet:ubuntu-15.04-ppc64le -MAINTAINER Amir Sanjar - -COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain - -RUN puppet apply -e "include bigtop_toolchain::installer" -COPY . /tmp/bigtop -RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/bigtop http://git-wip-us.apache.org/repos/asf/bigtop/blob/3f8eb648/docker/bigtop-slaves/ubuntu-15.04/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-slaves/ubuntu-15.04/Dockerfile b/docker/bigtop-slaves/ubuntu-15.04/Dockerfile deleted file mode 100644 index 9a622a3..0000000 --- a/docker/bigtop-slaves/ubuntu-15.04/Dockerfile +++ /dev/null @@ -1,22 +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 under the License. -FROM bigtop/puppet:ubuntu-15.04 -MAINTAINER Amir Sanjar - -COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain - -RUN puppet apply -e "include bigtop_toolchain::installer" -COPY . /tmp/bigtop -RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/bigtop
