From: Kefu Chai Date: Wed, 19 Feb 2020 07:26:56 +0000 (+0800) Subject: test/centos-8: add centos8 Dockerfile X-Git-Tag: v15.1.1~336^2~1 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8c044f75522900c7b3ba8bd400b452cb4a599321;p=ceph-ci.git test/centos-8: add centos8 Dockerfile and drop centos-7 Dockerfile, as we've moved over centos8 for better python3 support Signed-off-by: Kefu Chai --- diff --git a/src/test/centos-7/Dockerfile.in b/src/test/centos-7/Dockerfile.in deleted file mode 100644 index 0e06cfa6c72..00000000000 --- a/src/test/centos-7/Dockerfile.in +++ /dev/null @@ -1,33 +0,0 @@ -# -# Copyright (C) 2014, 2015 Red Hat -# -# Author: Loic Dachary -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Library Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# 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 Library Public License for more details. -# -# Environment variables are substituted via envsubst(1) -# -# user_id=$(id -u) -# os_version= the desired REPOSITORY TAG -# -FROM centos:%%os_version%% - -COPY install-deps.sh /root/ -COPY ceph.spec.in /root/ -# http://jperrin.github.io/centos/2014/09/25/centos-docker-and-systemd/ -RUN yum -y swap -- remove fakesystemd systemd-libs systemd-container -- install systemd systemd-libs && (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/* && yum install -y redhat-lsb-core -RUN yum install -y yum-utils && yum-config-manager --add-repo https://dl.fedoraproject.org/pub/epel/7/x86_64/ && yum install --nogpgcheck -y epel-release && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 && rm /etc/yum.repos.d/dl.fedoraproject.org* && yum-config-manager --enable cr -# build dependencies -RUN cd /root ; ./install-deps.sh -# development tools -# nc is required to run make check on firefly only (giant+ do not use nc) -RUN yum install -y ccache valgrind gdb git python-virtualenv gdisk kpartx jq sudo xmlstarlet parted nc -RUN if test %%USER%% != root ; then useradd -M --uid %%user_id%% %%USER%% && echo '%%USER%% ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers ; fi diff --git a/src/test/centos-7/ceph.spec.in b/src/test/centos-7/ceph.spec.in deleted file mode 120000 index 9abcafd12db..00000000000 --- a/src/test/centos-7/ceph.spec.in +++ /dev/null @@ -1 +0,0 @@ -../../../ceph.spec.in \ No newline at end of file diff --git a/src/test/centos-7/install-deps.sh b/src/test/centos-7/install-deps.sh deleted file mode 120000 index fc9c78b27ff..00000000000 --- a/src/test/centos-7/install-deps.sh +++ /dev/null @@ -1 +0,0 @@ -../../../install-deps.sh \ No newline at end of file diff --git a/src/test/centos-8/Dockerfile.in b/src/test/centos-8/Dockerfile.in new file mode 100644 index 00000000000..0e06cfa6c72 --- /dev/null +++ b/src/test/centos-8/Dockerfile.in @@ -0,0 +1,33 @@ +# +# Copyright (C) 2014, 2015 Red Hat +# +# Author: Loic Dachary +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Library Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# 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 Library Public License for more details. +# +# Environment variables are substituted via envsubst(1) +# +# user_id=$(id -u) +# os_version= the desired REPOSITORY TAG +# +FROM centos:%%os_version%% + +COPY install-deps.sh /root/ +COPY ceph.spec.in /root/ +# http://jperrin.github.io/centos/2014/09/25/centos-docker-and-systemd/ +RUN yum -y swap -- remove fakesystemd systemd-libs systemd-container -- install systemd systemd-libs && (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/* && yum install -y redhat-lsb-core +RUN yum install -y yum-utils && yum-config-manager --add-repo https://dl.fedoraproject.org/pub/epel/7/x86_64/ && yum install --nogpgcheck -y epel-release && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 && rm /etc/yum.repos.d/dl.fedoraproject.org* && yum-config-manager --enable cr +# build dependencies +RUN cd /root ; ./install-deps.sh +# development tools +# nc is required to run make check on firefly only (giant+ do not use nc) +RUN yum install -y ccache valgrind gdb git python-virtualenv gdisk kpartx jq sudo xmlstarlet parted nc +RUN if test %%USER%% != root ; then useradd -M --uid %%user_id%% %%USER%% && echo '%%USER%% ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers ; fi diff --git a/src/test/centos-8/ceph.spec.in b/src/test/centos-8/ceph.spec.in new file mode 120000 index 00000000000..9abcafd12db --- /dev/null +++ b/src/test/centos-8/ceph.spec.in @@ -0,0 +1 @@ +../../../ceph.spec.in \ No newline at end of file diff --git a/src/test/centos-8/install-deps.sh b/src/test/centos-8/install-deps.sh new file mode 120000 index 00000000000..fc9c78b27ff --- /dev/null +++ b/src/test/centos-8/install-deps.sh @@ -0,0 +1 @@ +../../../install-deps.sh \ No newline at end of file