From ce97babf2608bc50a6e6fe58f1f14394dac3dcd2 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 23 Nov 2020 09:41:52 +0800 Subject: [PATCH 1/5] add dockfile --- Ceph/CentOS7.6.1810/Dockerfile-bcache | 22 ++++++++++++++++++ Ceph/CentOS7.6.1810/Dockerfile-ceph-14.2.1 | 26 ++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 Ceph/CentOS7.6.1810/Dockerfile-bcache create mode 100644 Ceph/CentOS7.6.1810/Dockerfile-ceph-14.2.1 diff --git a/Ceph/CentOS7.6.1810/Dockerfile-bcache b/Ceph/CentOS7.6.1810/Dockerfile-bcache new file mode 100644 index 0000000..3d6f51d --- /dev/null +++ b/Ceph/CentOS7.6.1810/Dockerfile-bcache @@ -0,0 +1,22 @@ +FROM arm64v8/centos:1810 + +#RUN mv /etc/yum.repos.d /etc/yum.repos.d.bak && mkdir /etc/yum.repos.d +#COPY CentOS-AltArch-7.repo /etc/yum.repos.d/ . +#RUN yum clean all && yum makecache +#RUN yum -y install openssl +#RUN yum -y install elfutils-libelf-devel bc openssl-devel ncurses-devel libssl-dev wget gcc make rpm-build +#RUN mkdir /root/kernel +#RUN yum -y install openssl + +#WORKDIR /root/kernel +#RUN wget http://vault.centos.org/centos/7.6.1810/os/Source/SPackages/kernel-alt-4.14.0-115.el7a.0.1.src.rpm +#COPY kernel-alt-4.14.0-115.el7a.0.1.src.rpm . +#RUN rpm2cpio kernel-alt-4.14.0-115.el7a.0.1.src.rpm |cpio -div && tar -vxf linux-4.14.0-115.el7a.tar.xz + +#WORKDIR /root/kernel/linux-4.14.0-115.el7a +#WORKDIR /root +#RUN sed -i 'CONFIG_BCACHE="y"' .config +#COPY /usr/src/kernels/4.14.0-115.el7a.0.1.aarch64/.config .config . +#RUN yum -y install openssl +#RUN make rpm +#COPY .config . diff --git a/Ceph/CentOS7.6.1810/Dockerfile-ceph-14.2.1 b/Ceph/CentOS7.6.1810/Dockerfile-ceph-14.2.1 new file mode 100644 index 0000000..c96609a --- /dev/null +++ b/Ceph/CentOS7.6.1810/Dockerfile-ceph-14.2.1 @@ -0,0 +1,26 @@ +FROM arm64v8/centos:1810 + +RUN yum -y install centos-release-scl git deltarpm python3 epel-release bc openssl +RUN sed -i '8a baseurl=http://mirror.centos.org/altarch/7/sclo/$basearch/rh/' /etc/yum.repos.d/CentOS-SCLo-scl.repo +RUN yum -y install devtoolset-7 && scl enable devtoolset-7 bash +RUN echo "scl enable devtoolset-7 bash" >> /root/.bashrc && source /root/.bashrc + +WORKDIR /home +RUN yum -y install wget +RUN wget https://download.ceph.com/tarballs/ceph-14.2.1.tar.gz +RUN tar -zxvf ceph-14.2.1.tar.gz +RUN pip3 install virtualenv + +WORKDIR /home/ceph-14.2.1 +RUN sed -i '16c baseurl=https://buildlogs.centos.org/centos/7/sclo/$basearch/rh/' /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo +RUN sed -i '12a sslverify=false' /etc/yum.conf +RUN sed -i '338c $SUDO yum-config-manager --add-repo https://dl.fedoraproject.org/pub/epel/$MAJOR_VERSION/aarch64/' install-deps.sh +RUN sed -i "s/$SUDO yum remove centos-release-scl || true.*/$SUDO yum remove -y centos-release-scl || true/g" install-deps.sh && sh install-deps.sh +RUN sed -i '46c ${CMAKE} -DCMAKE_BUILD_TYPE=RelWithDebInfo $ARGS "$@" .. || exit 1' do_cmake.sh +RUN yum install rpmdevtools -y && rpmdev-setuptree +RUN sed -i '2c %_topdir /home/rpmbuild' /root/.rpmmacros && rpmdev-setuptree +RUN cp /home/ceph-14.2.1/ceph.spec /home/rpmbuild/SPECS/ && sed -i '1i %define _binaries_in_noarch_packages_terminate_build 0' /home/rpmbuild/SPECS/ceph.spec + +WORKDIR /home +RUN tar -cjvf ceph-14.2.1.tar.bz2 ceph-14.2.1 && cp ceph-14.2.1.tar.bz2 /home/rpmbuild/SOURCES/ +RUN rpmbuild -bb /home/rpmbuild/SPECS/ceph.spec -- Gitee From 4f4b81d34b1b64dce46170243bf1094b7f2780ba Mon Sep 17 00:00:00 2001 From: root Date: Mon, 23 Nov 2020 09:49:52 +0800 Subject: [PATCH 2/5] ceph bcache edit --- Ceph/CentOS7.6.1810/Dockerfile-bcache | 30 ++++++++++----------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/Ceph/CentOS7.6.1810/Dockerfile-bcache b/Ceph/CentOS7.6.1810/Dockerfile-bcache index 3d6f51d..617aacc 100644 --- a/Ceph/CentOS7.6.1810/Dockerfile-bcache +++ b/Ceph/CentOS7.6.1810/Dockerfile-bcache @@ -1,22 +1,14 @@ -FROM arm64v8/centos:1810 +FROM centos:1811 -#RUN mv /etc/yum.repos.d /etc/yum.repos.d.bak && mkdir /etc/yum.repos.d -#COPY CentOS-AltArch-7.repo /etc/yum.repos.d/ . -#RUN yum clean all && yum makecache -#RUN yum -y install openssl -#RUN yum -y install elfutils-libelf-devel bc openssl-devel ncurses-devel libssl-dev wget gcc make rpm-build -#RUN mkdir /root/kernel -#RUN yum -y install openssl +RUN yum -y install elfutils-libelf-devel bc openssl-devel ncurses-devel libssl-dev wget gcc make rpm-build +RUN mkdir /root/kernel +RUN yum -y install openssl -#WORKDIR /root/kernel -#RUN wget http://vault.centos.org/centos/7.6.1810/os/Source/SPackages/kernel-alt-4.14.0-115.el7a.0.1.src.rpm -#COPY kernel-alt-4.14.0-115.el7a.0.1.src.rpm . -#RUN rpm2cpio kernel-alt-4.14.0-115.el7a.0.1.src.rpm |cpio -div && tar -vxf linux-4.14.0-115.el7a.tar.xz +WORKDIR /root/kernel +RUN yum -y install wget +RUN wget http://vault.centos.org/centos/7.6.1810/os/Source/SPackages/kernel-alt-4.14.0-115.el7a.0.1.src.rpm +RUN rpm2cpio kernel-alt-4.14.0-115.el7a.0.1.src.rpm |cpio -div && tar -vxf linux-4.14.0-115.el7a.tar.xz +WORKDIR /root/kernel/linux-4.14.0-115.el7a +RUN cp /boot/config-4.14.0-115.el7a.0.1.aarch64 .config +RUN make rpm -#WORKDIR /root/kernel/linux-4.14.0-115.el7a -#WORKDIR /root -#RUN sed -i 'CONFIG_BCACHE="y"' .config -#COPY /usr/src/kernels/4.14.0-115.el7a.0.1.aarch64/.config .config . -#RUN yum -y install openssl -#RUN make rpm -#COPY .config . -- Gitee From 516c324e05c41aa6443d3704fb80e774920b17a2 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 23 Nov 2020 10:24:35 +0800 Subject: [PATCH 3/5] edit centos --- Ceph/CentOS7.6.1810/Dockerfile-bcache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ceph/CentOS7.6.1810/Dockerfile-bcache b/Ceph/CentOS7.6.1810/Dockerfile-bcache index 617aacc..5a271c4 100644 --- a/Ceph/CentOS7.6.1810/Dockerfile-bcache +++ b/Ceph/CentOS7.6.1810/Dockerfile-bcache @@ -1,4 +1,4 @@ -FROM centos:1811 +FROM arm64v8/centos:1810 RUN yum -y install elfutils-libelf-devel bc openssl-devel ncurses-devel libssl-dev wget gcc make rpm-build RUN mkdir /root/kernel -- Gitee From a3a1de50f9d07082ca4d1bb577ce681d8d838650 Mon Sep 17 00:00:00 2001 From: zl <13588030420@163.com> Date: Wed, 23 Dec 2020 15:07:03 +0800 Subject: [PATCH 4/5] ceph compilation modification --- Ceph/CentOS7.6.1810/Dockerfile-ceph-14.2.1 | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/Ceph/CentOS7.6.1810/Dockerfile-ceph-14.2.1 b/Ceph/CentOS7.6.1810/Dockerfile-ceph-14.2.1 index c96609a..1b5d6cc 100644 --- a/Ceph/CentOS7.6.1810/Dockerfile-ceph-14.2.1 +++ b/Ceph/CentOS7.6.1810/Dockerfile-ceph-14.2.1 @@ -1,21 +1,26 @@ FROM arm64v8/centos:1810 -RUN yum -y install centos-release-scl git deltarpm python3 epel-release bc openssl +RUN yum -y install centos-release-scl git deltarpm python3 epel-release bc openssl rsync RUN sed -i '8a baseurl=http://mirror.centos.org/altarch/7/sclo/$basearch/rh/' /etc/yum.repos.d/CentOS-SCLo-scl.repo -RUN yum -y install devtoolset-7 && scl enable devtoolset-7 bash -RUN echo "scl enable devtoolset-7 bash" >> /root/.bashrc && source /root/.bashrc +RUN yum -y install devtoolset-7 && scl enable devtoolset-7 bash +RUN echo "i=\`ps -ef| grep \"scl enable devtoolset-7 bash\" | wc -l\`" >> /root/.bashrc +RUN echo "if [ \$i -eq 1 ]; then" >> /root/.bashrc +RUN echo "scl enable devtoolset-7 bash" >> /root/.bashrc +RUN echo "fi" >> /root/.bashrc&& source /root/.bashrc WORKDIR /home RUN yum -y install wget RUN wget https://download.ceph.com/tarballs/ceph-14.2.1.tar.gz RUN tar -zxvf ceph-14.2.1.tar.gz -RUN pip3 install virtualenv +RUN pip3 install virtualenv WORKDIR /home/ceph-14.2.1 RUN sed -i '16c baseurl=https://buildlogs.centos.org/centos/7/sclo/$basearch/rh/' /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo RUN sed -i '12a sslverify=false' /etc/yum.conf RUN sed -i '338c $SUDO yum-config-manager --add-repo https://dl.fedoraproject.org/pub/epel/$MAJOR_VERSION/aarch64/' install-deps.sh -RUN sed -i "s/$SUDO yum remove centos-release-scl || true.*/$SUDO yum remove -y centos-release-scl || true/g" install-deps.sh && sh install-deps.sh +RUN pip3 install --upgrade pip +RUN sed -i "s/pyopenssl==17.5.0.*/#pyopenssl==17.5.0/g" /home/ceph-14.2.1/src/pybind/mgr/dashboard/requirements.txt +RUN sed -i "s/$SUDO yum remove centos-release-scl || true.*/$SUDO yum remove -y centos-release-scl || true/g" install-deps.sh&& sh install-deps.sh RUN sed -i '46c ${CMAKE} -DCMAKE_BUILD_TYPE=RelWithDebInfo $ARGS "$@" .. || exit 1' do_cmake.sh RUN yum install rpmdevtools -y && rpmdev-setuptree RUN sed -i '2c %_topdir /home/rpmbuild' /root/.rpmmacros && rpmdev-setuptree @@ -24,3 +29,9 @@ RUN cp /home/ceph-14.2.1/ceph.spec /home/rpmbuild/SPECS/ && sed -i '1i %define _ WORKDIR /home RUN tar -cjvf ceph-14.2.1.tar.bz2 ceph-14.2.1 && cp ceph-14.2.1.tar.bz2 /home/rpmbuild/SOURCES/ RUN rpmbuild -bb /home/rpmbuild/SPECS/ceph.spec + + +# archive output files +RUN mkdir -p /root/output/ \ + && cp -rp /home/rpmbuild/RPMS/* /root/output/ + -- Gitee From 788f02cf50582e8642a87543f5210e29cb006d34 Mon Sep 17 00:00:00 2001 From: zl <13588030420@163.com> Date: Wed, 23 Dec 2020 15:20:03 +0800 Subject: [PATCH 5/5] ceph rpm --- Ceph/CentOS7.6.1810/Dockerfile-ceph-14.2.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Ceph/CentOS7.6.1810/Dockerfile-ceph-14.2.1 b/Ceph/CentOS7.6.1810/Dockerfile-ceph-14.2.1 index 1b5d6cc..36acebc 100644 --- a/Ceph/CentOS7.6.1810/Dockerfile-ceph-14.2.1 +++ b/Ceph/CentOS7.6.1810/Dockerfile-ceph-14.2.1 @@ -12,13 +12,13 @@ WORKDIR /home RUN yum -y install wget RUN wget https://download.ceph.com/tarballs/ceph-14.2.1.tar.gz RUN tar -zxvf ceph-14.2.1.tar.gz -RUN pip3 install virtualenv +RUN pip3 install virtualenv +RUN pip3 install --upgrade pip WORKDIR /home/ceph-14.2.1 RUN sed -i '16c baseurl=https://buildlogs.centos.org/centos/7/sclo/$basearch/rh/' /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo RUN sed -i '12a sslverify=false' /etc/yum.conf RUN sed -i '338c $SUDO yum-config-manager --add-repo https://dl.fedoraproject.org/pub/epel/$MAJOR_VERSION/aarch64/' install-deps.sh -RUN pip3 install --upgrade pip RUN sed -i "s/pyopenssl==17.5.0.*/#pyopenssl==17.5.0/g" /home/ceph-14.2.1/src/pybind/mgr/dashboard/requirements.txt RUN sed -i "s/$SUDO yum remove centos-release-scl || true.*/$SUDO yum remove -y centos-release-scl || true/g" install-deps.sh&& sh install-deps.sh RUN sed -i '46c ${CMAKE} -DCMAKE_BUILD_TYPE=RelWithDebInfo $ARGS "$@" .. || exit 1' do_cmake.sh -- Gitee