[node-patches] Change in ovirt-node[master]: Drop /docker from the tree

rbarry at redhat.com rbarry at redhat.com
Tue Jul 29 13:11:29 UTC 2014


Ryan Barry has uploaded a new change for review.

Change subject: Drop /docker from the tree
......................................................................

Drop /docker from the tree

As building in Docker is not predicted to work in the future due
to limitations with SELinux enablement inside containers, drop it
from the tree

Change-Id: Iaba2ddea8b9a19958bf0eb4e0ffcf6265908679a
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
D docker/Dockerfile-el6
D docker/Dockerfile-f19
D docker/Dockerfile-f20
D docker/README.docker
D docker/buildovirt.sh
5 files changed, 0 insertions(+), 108 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/97/30797/1

diff --git a/docker/Dockerfile-el6 b/docker/Dockerfile-el6
deleted file mode 100644
index b83d29f..0000000
--- a/docker/Dockerfile-el6
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM centos:latest
-VOLUME ["/ovirt"]
-RUN yum -y install install livecd-tools appliance-tools-minimizer
-RUN yum -y install fedora-packager python-devel rpm-build createrepo
-RUN yum -y install selinux-policy-doc checkpolicy selinux-policy-devel
-RUN yum -y install autoconf automake python-mock python-lockfile
-
-ADD ./buildovirt.sh /buildovirt.sh
-ENTRYPOINT ["./buildovirt.sh"]
-CMD ["master"]
diff --git a/docker/Dockerfile-f19 b/docker/Dockerfile-f19
deleted file mode 100644
index b2c3b78..0000000
--- a/docker/Dockerfile-f19
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM mattdm/fedora
-VOLUME ["/ovirt"]
-RUN yum -y install install livecd-tools appliance-tools-minimizer
-RUN yum -y install fedora-packager python-devel rpm-build createrepo
-RUN yum -y install selinux-policy-doc checkpolicy selinux-policy-devel
-RUN yum -y install autoconf automake python-mock python-lockfile
-
-ADD ./buildovirt.sh /buildovirt.sh
-ENTRYPOINT ["./buildovirt.sh"]
-CMD ["master"]
diff --git a/docker/Dockerfile-f20 b/docker/Dockerfile-f20
deleted file mode 100644
index 4944055..0000000
--- a/docker/Dockerfile-f20
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM fedora:20
-VOLUME ["/ovirt"]
-RUN yum -y install install livecd-tools appliance-tools-minimizer
-RUN yum -y install fedora-packager python-devel rpm-build createrepo
-RUN yum -y install selinux-policy-doc checkpolicy selinux-policy-devel
-RUN yum -y install autoconf automake python-mock python-lockfile
-
-ADD ./buildovirt.sh /buildovirt.sh
-ENTRYPOINT ["./buildovirt.sh"]
-CMD ["master"]
diff --git a/docker/README.docker b/docker/README.docker
deleted file mode 100644
index 90fbf06..0000000
--- a/docker/README.docker
+++ /dev/null
@@ -1,28 +0,0 @@
-
-What it does
-------------
-A docker container is used to build oVirt Node.
-
-Why this makes sense
---------------------
-oVirt Node for $DIST needs to be build on a host with $DIST. Otherwise you
-will rnu into weird problems related to e.g. SELinux.
-
-How to start
-------------
-
-This has been tested on Fedora 19 and 20.
-
-Install docker
-
-    $ sudo yum install -y docker-io
-
-Start docker (and check that it's running)
-
-    $ sudo service docker start
-    $ sudo service docker status
-
-Build oVirt Node in docker
---------------------------
-
-    $ sudo docker build - < Dockerfile-f20
diff --git a/docker/buildovirt.sh b/docker/buildovirt.sh
deleted file mode 100755
index b391808..0000000
--- a/docker/buildovirt.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-# oVirt Node ISO build script
-#
-# Copyright (C) 2014 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA  02110-1301, USA.  A copy of the GNU General Public License is
-# also available at http://www.gnu.org/copyleft/gpl.html.
-
-cd /ovirt
-git clone http://gerrit.ovirt.org/p/ovirt-node.git
-git clone http://gerrit.ovirt.org/p/ovirt-node-iso.git
-
-export OVIRT_NODE_BASE=$PWD
-OVIRT_CACHE_DIR=/ovirt/ovirt-cache
-OVIRT_LOCAL_REPO=file://${OVIRT_CACHE_DIR}/ovirt
-export OVIRT_CACHE_DIR
-export OVIRT_LOCAL_REPO
-BUILD_NUMBER=999
-
-cd ovirt-node
-if [[ "$1" == "master" ]]; then
-  git checkout master
-else
-  git fetch $1 && git checkout FETCH_HEAD
-fi
-make distclean
-./autogen.sh --with-image-minimizer 
-make iso publish
-CONFIGURE_ARGS="--with-recipe=../ovirt-node/recipe"
-if [ ! -z $BUILD_NUMBER ]; then
-  CONFIGURE_ARGS+=" --with-build-number=$BUILD_NUMBER"
-fi
-cd ../ovirt-node-iso
-rm *.iso
-make distclean
-./autogen.sh ${CONFIGURE_ARGS}
-make rpms
-make iso


-- 
To view, visit http://gerrit.ovirt.org/30797
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaba2ddea8b9a19958bf0eb4e0ffcf6265908679a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>



More information about the node-patches mailing list