From 5172a60324760298c096ac63b0dc6c42effa0718 Mon Sep 17 00:00:00 2001 From: Mario Alfredo Carrillo Arevalo Date: Tue, 30 Oct 2018 16:50:38 -0600 Subject: [PATCH] Remove deprecated Dockerfiles Due to dockerfiles have been unified, this code can be removed. Story: 2003712 Task: 226370 Depends On: https://review.openstack.org/#/c/601308/ Change-Id: I8ebaf83c9f52e2993c17073bbe3f2eaaf1542931 Signed-off-by: Mario Alfredo Carrillo Arevalo --- Dockerfile.centos73 | 31 -------- Dockerfile.centos73.TC-builder | 137 --------------------------------- centos-mirror-tools/Dockerfile | 25 ------ 3 files changed, 193 deletions(-) delete mode 100644 Dockerfile.centos73 delete mode 100644 Dockerfile.centos73.TC-builder delete mode 100644 centos-mirror-tools/Dockerfile diff --git a/Dockerfile.centos73 b/Dockerfile.centos73 deleted file mode 100644 index ec97480f..00000000 --- a/Dockerfile.centos73 +++ /dev/null @@ -1,31 +0,0 @@ -# Basic software build CentOS 7.3 - -FROM centos:7.3.1611 - -RUN yum install -y epel-release && \ - yum install -y lighttpd lighttpd-fastcgi lighttpd-mod_geoip \ - sudo systemd \ - anaconda anaconda-help anaconda-runtime bc python-psutil createrepo /usr/bin/yumdownloader \ - /usr/bin/mkisofs git quilt pax perl-CPAN gcc expat-devel syslinux udisks2 rpm-build rpm-sign deltarpm \ - python-deltarpm rpm-python cpanminus wget \ - bind bind-utils squashfs-tools - -# cpan modules, installing with cpanminus to avoid stupid questions since cpan is whack -RUN cpanm --notest Fatal && \ - cpanm --notest XML::SAX && \ - cpanm --notest XML::SAX::Expat && \ - cpanm --notest XML::Parser && \ - cpanm --notest XML::Simple - -# don't know if these need to be after the cpan installs or not. putting here due to order in instructions -RUN yum install -y vim-enhanced openssl-devel gettext mongodb mongodb-server mariadb-devel python-testrepository \ - python-tox python-pep8 python-pip postgresql postgresql-devel python-devel libxml2 libxml2-devel libxslt-devel \ - libffi-devel sqlite-devel openldap-devel libvirt-devel python-subunit qemu-kvm - -# pip installs -RUN pip install python-subunit junitxml --upgrade && \ - pip install tox pycryptodome --upgrade - -# Install repo tool -RUN curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo && \ - chmod a+x /usr/local/bin/repo diff --git a/Dockerfile.centos73.TC-builder b/Dockerfile.centos73.TC-builder deleted file mode 100644 index 6d3981c3..00000000 --- a/Dockerfile.centos73.TC-builder +++ /dev/null @@ -1,137 +0,0 @@ -# This file provides a TC build container -# -# Usage: -# -# $cp ~/.gitconfig toCOPY; -# $docker build --build-arg MYUID=`id -u` -t local/tc-builder:7.3 -f Dockerfile.centos73.TC-builder . -# -# container usage: - -# docker run -it --rm --name centos-builder -v `pwd`/localdisk:/localdisk -v `pwd`/mirror:/import/mirrors -v ~/.ssh:/mySSH:ro -p 8088:8088 --net=host -v /sys/fs/cgroup:/sys/fs/cgroup:ro -e "container=docker" --privileged=true --security-opt seccomp=unconfined local/tc-builder:7.3 - - -FROM local/dev-centos:7.3 -MAINTAINER brian avery - -ARG MYUID=1000 -# username you will docker exec into the container as . it should NOT be your host username so you can easily tell -# if you are in our out of the container. -ARG MYUNAME=builder - -ENV container=docker - -# mock time -# forcing chroots since a couple of packages naughtily insist on network access and -# we dont have nspawn and networks happy together. -RUN groupadd -g 751 cgts && \ - echo "mock:x:751:root" >> /etc/group && \ - echo "mockbuild:x:9001:" >> /etc/group && \ - yum install -y mock epel-release rpm-build && \ - useradd -s /sbin/nologin -u 9001 -g 9001 mockbuild && \ - rmdir /var/lib/mock && \ - ln -s /localdisk/loadbuild/mock /var/lib/mock && \ - rmdir /var/cache/mock && \ - ln -s /localdisk/loadbuild/mock-cache /var/cache/mock && \ - echo "config_opts['use_nspawn'] = False" >> /etc/mock/site-defaults.cfg && \ - echo "config_opts['rpmbuild_networking'] = True" >> /etc/mock/site-defaults.cfg && \ - echo >> /etc/mock/site-defaults.cfg - -# Inherited tools for mock stuff -# we at least need the mock_cache_unlock tool -# they install into /usr/bin -COPY toCOPY/cgcs_overlay /opt/cgcs_overlay -RUN cd /opt/cgcs_overlay && \ - make && \ - make install - - - -# ENV setup -RUN echo "# Load stx-builder configuration" >> /etc/profile.d/TC.sh && \ - echo "if [[ -r \${HOME}/buildrc ]]; then" >> /etc/profile.d/TC.sh && \ - echo " source \${HOME}/buildrc" >> /etc/profile.d/TC.sh && \ - echo " export PROJECT SRC_BUILD_ENVIRONMENT MYPROJECTNAME MYUNAME" >> /etc/profile.d/TC.sh && \ - echo " export MY_BUILD_CFG MY_BUILD_CFG_RT MY_BUILD_CFG_STD MY_BUILD_DIR MY_BUILD_ENVIRONMENT MY_BUILD_ENVIRONMENT_FILE MY_BUILD_ENVIRONMENT_FILE_RT MY_BUILD_ENVIRONMENT_FILE_STD MY_DEBUG_BUILD_CFG_RT MY_DEBUG_BUILD_CFG_STD MY_LOCAL_DISK MY_MOCK_ROOT MY_REPO MY_REPO_ROOT_DIR MY_SRC_RPM_BUILD_DIR MY_TC_RELEASE MY_WORKSPACE" >> /etc/profile.d/TC.sh && \ - echo "fi" >> /etc/profile.d/TC.sh && \ - echo "export FORMAL_BUILD=0" >> /etc/profile.d/TC.sh && \ - echo "export PATH=\$MY_REPO/build-tools:\$PATH" >> /etc/profile.d/TC.sh - -# centos locales are broken. this needs to be run after the last yum install/update -RUN localedef -i en_US -f UTF-8 en_US.UTF-8 - -# setup -RUN mkdir -p /www/run && \ - mkdir -p /www/logs && \ - mkdir -p /www/home && \ - mkdir -p /www/root/htdocs/localdisk && \ - chown -R $MYUID:cgts /www && \ - ln -s /localdisk/loadbuild /www/root/htdocs/localdisk/loadbuild && \ - ln -s /import/mirrors/CentOS /www/root/htdocs/CentOS && \ - ln -s /import/mirrors/fedora /www/root/htdocs/fedora && \ - ln -s /localdisk/designer /www/root/htdocs/localdisk/designer - -# lighthttpd setup -# chmod for /var/log/lighttpd fixes a centos issue -# in place sed for server root since it's expanded soon thereafter -# echo "server.bind = \"localhost\"" >> /etc/lighttpd/lighttpd.conf && \ -RUN echo "$MYUNAME ALL=(ALL:ALL) NOPASSWD:ALL" >> /etc/sudoers && \ - mkdir -p /var/log/lighttpd && \ - chmod a+rwx /var/log/lighttpd/ && \ - sed -i 's%^var\.log_root.*$%var.log_root = "/www/logs"%g' /etc/lighttpd/lighttpd.conf && \ - sed -i 's%^var\.server_root.*$%var.server_root = "/www/root"%g' /etc/lighttpd/lighttpd.conf && \ - sed -i 's%^var\.home_dir.*$%var.home_dir = "/www/home"%g' /etc/lighttpd/lighttpd.conf && \ - sed -i 's%^var\.state_dir.*$%var.state_dir = "/www/run"%g' /etc/lighttpd/lighttpd.conf && \ - sed -i "s/server.port/#server.port/g" /etc/lighttpd/lighttpd.conf && \ - sed -i "s/server.use-ipv6/#server.use-ipv6/g" /etc/lighttpd/lighttpd.conf && \ - sed -i "s/server.username/#server.username/g" /etc/lighttpd/lighttpd.conf && \ - sed -i "s/server.groupname/#server.groupname/g" /etc/lighttpd/lighttpd.conf && \ - sed -i "s/server.bind/#server.bind/g" /etc/lighttpd/lighttpd.conf && \ - sed -i "s/server.document-root/#server.document-root/g" /etc/lighttpd/lighttpd.conf && \ - sed -i "s/server.dirlisting/#server.dirlisting/g" /etc/lighttpd/lighttpd.conf && \ - echo "server.port = 8088" >> /etc/lighttpd/lighttpd.conf && \ - echo "server.use-ipv6 = \"disable\"" >> /etc/lighttpd/lighttpd.conf && \ - echo "server.username = \"$MYUNAME\"" >> /etc/lighttpd/lighttpd.conf && \ - echo "server.groupname = \"cgts\"" >> /etc/lighttpd/lighttpd.conf && \ - echo "server.bind = \"localhost\"" >> /etc/lighttpd/lighttpd.conf && \ - echo "server.document-root = \"/www/root/htdocs\"" >> /etc/lighttpd/lighttpd.conf && \ - sed -i "s/dir-listing.activate/#dir-listing.activate/g" /etc/lighttpd/conf.d/dirlisting.conf && \ - echo "dir-listing.activate = \"enable\"" >> /etc/lighttpd/conf.d/dirlisting.conf - -# Systemd Enablement -RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \ - rm -f /lib/systemd/system/multi-user.target.wants/*;\ - rm -f /etc/systemd/system/*.wants/*;\ - rm -f /lib/systemd/system/local-fs.target.wants/*; \ - rm -f /lib/systemd/system/sockets.target.wants/*udev*; \ - rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \ - rm -f /lib/systemd/system/basic.target.wants/*;\ - rm -f /lib/systemd/system/anaconda.target.wants/* - -# Without this, init won't start the enabled services and exec'ing and starting -# them reports "Failed to get D-Bus connection: Operation not permitted". -VOLUME /run /tmp - - -RUN useradd -r -u $MYUID -g cgts -m $MYUNAME && \ - ln -s /home/$MYUNAME/.ssh /mySSH - -COPY toCOPY/finishSetup.sh /usr/local/bin -COPY toCOPY/generate-cgcs-tis-repo /usr/local/bin -COPY toCOPY/generate-cgcs-centos-repo.sh /usr/local/bin -COPY toCOPY/.inputrc /home/$MYUNAME/ -COPY toCOPY/.gitconfig /home/$MYUNAME/ - - -# now that we are doing systemd, make the startup script be in bashrc -# also we need to SHADOW the udev centric mkefiboot script with a sudo centric one -RUN echo "bash -C /usr/local/bin/finishSetup.sh" >> /home/$MYUNAME/.bashrc && \ - echo "export PATH=/usr/local/bin:/localdisk/designer/$MYUNAME/bin:\$PATH" >> /home/$MYUNAME/.bashrc && \ - chmod a+x /usr/local/bin/* - -## old way -# USER $MYUID:cgts -#ENTRYPOINT ["/usr/bin/bash"] -# CMD bash -C '/localdisk/start.sh';'bash' - -# Don't know if it's possible to run services without starting this -CMD /usr/sbin/init diff --git a/centos-mirror-tools/Dockerfile b/centos-mirror-tools/Dockerfile deleted file mode 100644 index eb1f4578..00000000 --- a/centos-mirror-tools/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -## mirror download container - -FROM centos:7.4.1708 - -WORKDIR /localdisk - -#ENV http_proxy "http://your.actual_http_proxy.com:your_port" -#ENV https_proxy "https://your.actual_https_proxy.com:your_port" -#ENV ftp_proxy "http://your.actual_ftp_proxy.com:your_port" - -#RUN echo "proxy=$http_proxy" >> /etc/yum.conf && \ -# echo -e "export http_proxy=$http_proxy\nexport https_proxy=$https_proxy\n\ -#export ftp_proxy=$ftp_proxy" >> /root/.bashrc - -RUN yum install -y epel-release sudo vim-enhanced net-tools git \ - /usr/bin/yumdownloader rpm-build rpm-sign deltarpm wget bind \ - bind-utils && rm /etc/yum.repos.d/CentOS-Sources.repo \ - /etc/yum.repos.d/epel.repo - -COPY yum.repos.d/* /etc/yum.repos.d/ -COPY rpm-gpg-keys/* /etc/pki/rpm-gpg/ - -RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY* - -ENTRYPOINT ["/bin/bash"]