diff options
author | Thomas Wiest <twiest@users.noreply.github.com> | 2014-12-15 16:07:19 -0500 |
---|---|---|
committer | Thomas Wiest <twiest@users.noreply.github.com> | 2014-12-15 16:07:19 -0500 |
commit | 9830202b133db241493ca3f3d914e1cb1de35963 (patch) | |
tree | 0bb33e5ee852ea533f1f808a8e86e38c97699bb4 /roles/docker_img_rhel6ops/files | |
parent | 2848232bdaed44fadb51548fe9d6c39fe89b8e11 (diff) | |
parent | 023f92f9e3eec7de6c1286549000be79189a4fde (diff) | |
download | openshift-9830202b133db241493ca3f3d914e1cb1de35963.tar.gz openshift-9830202b133db241493ca3f3d914e1cb1de35963.tar.bz2 openshift-9830202b133db241493ca3f3d914e1cb1de35963.tar.xz openshift-9830202b133db241493ca3f3d914e1cb1de35963.zip |
Merge pull request #36 from twiest/pr
changed atomic proxy to use pre-built container images
Diffstat (limited to 'roles/docker_img_rhel6ops/files')
10 files changed, 0 insertions, 165 deletions
diff --git a/roles/docker_img_rhel6ops/files/rhel6ops_container/Dockerfile b/roles/docker_img_rhel6ops/files/rhel6ops_container/Dockerfile deleted file mode 100644 index 86783f96d..000000000 --- a/roles/docker_img_rhel6ops/files/rhel6ops_container/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM rhel6 -MAINTAINER Thomas Wiest <twiest@redhat.com> - -ENV CONTAINER docker -ENV USER root -ENV HOME /root -ENV TERM xterm -WORKDIR /root - -# creature comforts -ADD bashrc /root/.bashrc - -# Add the yum repos -ADD etc/yum.repos.d/ /etc/yum.repos.d - -# Add yum vars -RUN echo -n 6 > /etc/yum/vars/majorrelease - -# setup links for the yum mirror certs -RUN ln -s /run/secrets/etc-pki-entitlement/yum/client-cert.pem /var/lib/yum/client-cert.pem ; \ - ln -s /run/secrets/etc-pki-entitlement/yum/client-key.pem /var/lib/yum/client-key.pem - - -RUN rpm --import /etc/pki/rpm-gpg/* && \ -yum clean metadata && \ -yum -y remove subscription-manager && \ -yum -y install vim-enhanced telnet && \ -yum -y update && \ -yum clean all diff --git a/roles/docker_img_rhel6ops/files/rhel6ops_container/bashrc b/roles/docker_img_rhel6ops/files/rhel6ops_container/bashrc deleted file mode 100644 index 343051d19..000000000 --- a/roles/docker_img_rhel6ops/files/rhel6ops_container/bashrc +++ /dev/null @@ -1,14 +0,0 @@ -# .bashrc - -# User specific aliases and functions - -alias ls='ls --color' -alias rm='rm -i' -alias cp='cp -i' -alias mv='mv -i' -alias vi=vim - -# Source global definitions -if [ -f /etc/bashrc ]; then - . /etc/bashrc -fi diff --git a/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/epel.repo b/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/epel.repo deleted file mode 100644 index 583ca72c9..000000000 --- a/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/epel.repo +++ /dev/null @@ -1,16 +0,0 @@ -[epel] -name=Extra Packages for Enterprise Linux 6 - $basearch -baseurl=http://mirror.ops.rhcloud.com/mirror/epel/6/$basearch/ -failovermethod=priority -enabled=1 -gpgcheck=0 -exclude=libmongodb mongodb* nodejs* - -[epel-testing] -name=Extra Packages for Enterprise Linux 6 - Testing - $basearch -baseurl=http://mirror.ops.rhcloud.com/mirror/epel/testing/6/$basearch/ -failovermethod=priority -enabled=0 -gpgcheck=0 -exclude=libmongodb mongodb* nodejs* - diff --git a/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/li-rhscl.repo b/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/li-rhscl.repo deleted file mode 100644 index 4f3bf1a00..000000000 --- a/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/li-rhscl.repo +++ /dev/null @@ -1,15 +0,0 @@ -[li-rhscl] -name=Li RHSCL repo for Enterprise Linux $majorrelease - $basearch -baseurl=https://mirror.ops.rhcloud.com/libra/rhscl-rhel-$majorrelease-libra/$basearch/ - https://use-mirror1.ops.rhcloud.com/libra/rhscl-rhel-$majorrelease-libra/$basearch/ - https://use-mirror2.ops.rhcloud.com/libra/rhscl-rhel-$majorrelease-libra/$basearch/ - https://euw-mirror1.ops.rhcloud.com/libra/rhscl-rhel-$majorrelease-libra/$basearch/ - https://gce-mirror1.ops.rhcloud.com/libra/rhscl-rhel-$majorrelease-libra/$basearch/ - https://gce-mirror2.ops.rhcloud.com/libra/rhscl-rhel-$majorrelease-libra/$basearch/ -enabled=1 -gpgcheck=1 -gpgkey=https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted -failovermethod=priority -sslverify=0 -sslclientcert=/var/lib/yum/client-cert.pem -sslclientkey=/var/lib/yum/client-key.pem diff --git a/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/li-staging.repo b/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/li-staging.repo deleted file mode 100644 index 35a8babe1..000000000 --- a/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/li-staging.repo +++ /dev/null @@ -1,15 +0,0 @@ -[li-staging] -name=Staging Li repo for Enterprise Linux $majorrelease - $basearch -baseurl=https://mirror.ops.rhcloud.com/libra/rhel-$majorrelease-libra-stage/$basearch/ - https://use-mirror1.ops.rhcloud.com/libra/rhel-$majorrelease-libra-stage/$basearch/ - https://use-mirror2.ops.rhcloud.com/libra/rhel-$majorrelease-libra-stage/$basearch/ - https://euw-mirror1.ops.rhcloud.com/libra/rhel-$majorrelease-libra-stage/$basearch/ - https://gce-mirror1.ops.rhcloud.com/libra/rhel-$majorrelease-libra-stage/$basearch/ - https://gce-mirror2.ops.rhcloud.com/libra/rhel-$majorrelease-libra-stage/$basearch/ -enabled=1 -gpgcheck=0 -gpgkey=https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted -failovermethod=priority -sslverify=0 -sslclientcert=/var/lib/yum/client-cert.pem -sslclientkey=/var/lib/yum/client-key.pem diff --git a/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/li.repo b/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/li.repo deleted file mode 100644 index be2cf66b5..000000000 --- a/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/li.repo +++ /dev/null @@ -1,15 +0,0 @@ -[li] -name=Li repo for Enterprise Linux $majorrelease - $basearch -baseurl=https://mirror.ops.rhcloud.com/libra/rhel-$majorrelease-libra/$basearch/ - https://use-mirror1.ops.rhcloud.com/libra/rhel-$majorrelease-libra/$basearch/ - https://use-mirror2.ops.rhcloud.com/libra/rhel-$majorrelease-libra/$basearch/ - https://euw-mirror1.ops.rhcloud.com/libra/rhel-$majorrelease-libra/$basearch/ - https://gce-mirror1.ops.rhcloud.com/libra/rhel-$majorrelease-libra/$basearch/ - https://gce-mirror2.ops.rhcloud.com/libra/rhel-$majorrelease-libra/$basearch/ -enabled=1 -gpgcheck=1 -gpgkey=https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted -failovermethod=priority -sslverify=0 -sslclientcert=/var/lib/yum/client-cert.pem -sslclientkey=/var/lib/yum/client-key.pem diff --git a/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/oso-rhui-rhel-server-releases-optional.repo b/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/oso-rhui-rhel-server-releases-optional.repo deleted file mode 100644 index eea68789e..000000000 --- a/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/oso-rhui-rhel-server-releases-optional.repo +++ /dev/null @@ -1,16 +0,0 @@ -[oso-rhui-rhel-server-releases-optional] -name=OpenShift Online RHUI Mirror RH Enterprise Linux $majorrelease - Optional -baseurl=https://mirror.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-releases-optional/ - https://use-mirror1.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-releases-optional/ - https://use-mirror2.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-releases-optional/ - https://euw-mirror1.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-releases-optional/ - https://gce-mirror1.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-releases-optional/ - https://gce-mirror2.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-releases-optional/ -enabled=1 -gpgcheck=1 -gpgkey=https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted -exclude=libcgroup* gluster* -failovermethod=priority -sslverify=False -sslclientcert=/var/lib/yum/client-cert.pem -sslclientkey=/var/lib/yum/client-key.pem diff --git a/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/oso-rhui-rhel-server-releases.repo b/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/oso-rhui-rhel-server-releases.repo deleted file mode 100644 index 5b11139c7..000000000 --- a/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/oso-rhui-rhel-server-releases.repo +++ /dev/null @@ -1,16 +0,0 @@ -[oso-rhui-rhel-server-releases] -name=OpenShift Online RHUI Mirror RH Enterprise Linux $majorrelease -baseurl=https://mirror.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-releases/ - https://use-mirror1.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-releases/ - https://use-mirror2.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-releases/ - https://euw-mirror1.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-releases/ - https://gce-mirror1.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-releases/ - https://gce-mirror2.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-releases/ -enabled=1 -gpgcheck=1 -gpgkey=https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted -exclude=libcgroup* gluster* -failovermethod=priority -sslverify=False -sslclientcert=/var/lib/yum/client-cert.pem -sslclientkey=/var/lib/yum/client-key.pem diff --git a/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/oso-rhui-rhel-server-rhscl.repo b/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/oso-rhui-rhel-server-rhscl.repo deleted file mode 100644 index e62d7ad18..000000000 --- a/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/oso-rhui-rhel-server-rhscl.repo +++ /dev/null @@ -1,15 +0,0 @@ -[oso-rhui-rhel-server-rhscl] -name=OpenShift Online RHUI Mirror RH Enterprise Linux $majorrelease - RHSCL -baseurl=https://mirror.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-rhscl/ - https://use-mirror1.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-rhscl/ - https://use-mirror2.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-rhscl/ - https://euw-mirror1.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-rhscl/ - https://gce-mirror1.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-rhscl/ - https://gce-mirror2.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-rhscl/ -enabled=1 -gpgcheck=1 -gpgkey=https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted -failovermethod=priority -sslverify=False -sslclientcert=/var/lib/yum/client-cert.pem -sslclientkey=/var/lib/yum/client-key.pem diff --git a/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/zabbix.repo b/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/zabbix.repo deleted file mode 100644 index 68a6ede8c..000000000 --- a/roles/docker_img_rhel6ops/files/rhel6ops_container/etc/yum.repos.d/zabbix.repo +++ /dev/null @@ -1,14 +0,0 @@ -[zabbix] -name=Zend Server -baseurl=http://mirror.ops.rhcloud.com/mirror/zabbix/$majorrelease/$basearch - http://use-mirror1.ops.rhcloud.com/mirror/zabbix/$majorrelease/$basearch - http://use-mirror2.ops.rhcloud.com/mirror/zabbix/$majorrelease/$basearch - http://euw-mirror1.ops.rhcloud.com/mirror/zabbix/$majorrelease/$basearch -enabled=1 -gpgcheck=1 -gpgkey=http://mirror.ops.rhcloud.com/mirror/zabbix/keys/RPM-GPG-KEY-ZABBIX -failovermethod=priority -sslverify=0 -sslclientcert=/var/lib/yum/client-cert.pem -sslclientkey=/var/lib/yum/client-key.pem - |