diff --git a/DBMS/CentOS8.1.1911/mysql/8.0.17/Dockerfile-mysql-8.0.17 b/DBMS/CentOS8.1.1911/mysql/8.0.17/Dockerfile-mysql-8.0.17 index 88a927498fa5a1197cace8fffaf41d1fca9ed25e..34cb33877ef999d68c3d7aafa2054a3c48110d2b 100644 --- a/DBMS/CentOS8.1.1911/mysql/8.0.17/Dockerfile-mysql-8.0.17 +++ b/DBMS/CentOS8.1.1911/mysql/8.0.17/Dockerfile-mysql-8.0.17 @@ -1,5 +1,5 @@ # Starting from CentOS 7.6.1810 aarch64 -FROM arm64v8/centos:1911 +FROM arm64v8/centos:8.1.1911 LABEL maintainer="x.zhou.qd@hotmail.com" @@ -9,44 +9,50 @@ ARG COMPILE_THREAD="lscpu | grep ^CPU\(s\): | awk '{print \$2}'" # Install required packages from yum, use Huawei Cloud Mirror 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/. +COPY centos-altarch-8.repo /etc/yum.repos.d/. +COPY rpcsvc-proto-1.4.tar.gz /home/. RUN yum clean all \ && yum makecache \ - && yum -y install bison ncurses ncurses-devel libaio-devel openssl openssl-devel gmp gmp-devel mpfr mpfr-devel libmpc libmpc-devel gcc gcc-c++ cmake net-tools wget tar git rpcgen rpm-build unzip + && yum -y install bison ncurses ncurses-devel libaio-devel openssl openssl-devel gmp gmp-devel mpfr mpfr-devel libmpc gcc gcc-c++ cmake automake make net-tools wget tar git rpm-build unzip libtirpc-devel +# && yum -y install libmpc # Update cmake and gcc to proper version WORKDIR /home # RUN wget "https://cmake.org/files/v3.5/cmake-3.5.2.tar.gz" \ # && wget "https://mirrors.tuna.tsinghua.edu.cn/gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.gz" \ -RUN wget "http://archive-server:50050/cache-data/DBMS/ENV/cmake-3.5.2.tar.gz" \ - && wget "http://archive-server:50050/cache-data/DBMS/ENV/gcc-7.3.0.tar.gz" \ - && tar -zxf cmake-3.5.2.tar.gz \ - && tar -zxf gcc-7.3.0.tar.gz \ +RUN wget https://cmake.org/files/v3.5/cmake-3.5.2.tar.gz --no-check-certificate \ + && wget "http://rpmfind.net/linux/centos/8.4.2105/PowerTools/aarch64/os/Packages/libmpc-devel-1.1.0-9.1.el8.aarch64.rpm" \ +## && wget https://github.com/thkukuk/rpcsvc-proto/releases/download/v1.4/rpcsvc-proto-1.4.tar.gz --no-check-certificate \ + && tar -zxvf cmake-3.5.2.tar.gz \ + && tar -zxvf rpcsvc-proto-1.4.tar.gz \ + && rpm -ivh libmpc-devel-1.1.0-9.1.el8.aarch64.rpm \ && cd cmake-3.5.2/ \ && ./bootstrap \ && make -j$(eval ${COMPILE_THREAD}) \ && make -j$(eval ${COMPILE_THREAD}) install \ && yum remove cmake -y \ && ln -s /usr/local/bin/cmake /usr/bin \ - && cd ../gcc-7.3.0/ \ - && ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-bootstrap \ + && cd ../rpcsvc-proto-1.4/ \ + && ./configure \ && make -j$(eval ${COMPILE_THREAD}) \ && make -j$(eval ${COMPILE_THREAD}) install # Get rpm bug fix files -# RUN wget "https://mirrors.huaweicloud.com/kunpeng/archive/kunpeng_solution/database/patch/rpm-bug.zip" \ -RUN wget "http://archive-server:50050/cache-data/DBMS/ENV/rpm-bug.zip" \ +RUN wget "https://mirrors.huaweicloud.com/kunpeng/archive/kunpeng_solution/database/patch/rpm-bug.zip" \ +# RUN wget "http://archive-server:50050/cache-data/DBMS/ENV/rpm-bug.zip" \ && unzip rpm-bug.zip # Get MySQL source code, build and install WORKDIR /root -# RUN wget "https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.17.tar.gz" \ -RUN wget "http://archive-server:50050/cache-data/DBMS/MySQL/mysql-boost-8.0.17.tar.gz" \ +RUN wget "https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.17.tar.gz" \ +# RUN wget "http://archive-server:50050/cache-data/DBMS/MySQL/mysql-boost-8.0.17.tar.gz" \ && mkdir -p rpmbuild/{BUILD,SOURCES,SPECS,RPMS} \ && mv mysql-boost-8.0.17.tar.gz rpmbuild/SOURCES/. \ && mv /home/rpm-bug/* rpmbuild/SOURCES/. COPY my.cnf rpmbuild/SOURCES/. COPY mysql8.0.17.spec rpmbuild/SPECS/. -RUN rpmbuild -bb rpmbuild/SPECS/mysql8.0.17.spec \ - && mkdir -p /root/output \ - && cp rpmbuild/RPMS/aarch64/mysql-8.0.17-1.el7.aarch64.rpm output/. +RUN rpmbuild -bb rpmbuild/SPECS/mysql8.0.17.spec +# && mkdir -p /root/output \ +RUN mkdir -p /root/output +RUN cp rpmbuild/RPMS/aarch64/mysql-8.0.17-1.el8.aarch64.rpm output/. + #&& cp rpmbuild/RPMS/aarch64/mysql-8.0.17-1.el8.aarch64.rpm output/. diff --git a/DBMS/CentOS8.1.1911/mysql/8.0.17/centos-altarch-8.repo b/DBMS/CentOS8.1.1911/mysql/8.0.17/centos-altarch-8.repo new file mode 100644 index 0000000000000000000000000000000000000000..f8ec2d844e32b3b4021ec506c9505e38ba0ee5be --- /dev/null +++ b/DBMS/CentOS8.1.1911/mysql/8.0.17/centos-altarch-8.repo @@ -0,0 +1,54 @@ +# CentOS-AppStream.repo +# +# The mirror system uses the connecting IP address of the client and the +# update status of each mirror to pick mirrors that are updated to and +# geographically close to the client. You should use this for CentOS updates +# unless you are manually picking other mirrors. +# +# If the mirrorlist= does not work for you, as a fall back you can try the +# remarked out baseurl= line instead. +# +# + +[AppStream] +name=CentOS-$releasever - AppStream +baseurl=https://mirrors.ustc.edu.cn/centos/$releasever/AppStream/$basearch/os/ +gpgcheck=0 +enabled=1 + +# CentOS-Base.repo +# +# The mirror system uses the connecting IP address of the client and the +# update status of each mirror to pick mirrors that are updated to and +# geographically close to the client. You should use this for CentOS updates +# unless you are manually picking other mirrors. +# +# If the mirrorlist= does not work for you, as a fall back you can try the +# remarked out baseurl= line instead. +# +# + +[BaseOS] +name=CentOS-$releasever - Base +baseurl=https://mirrors.ustc.edu.cn/centos/$releasever/BaseOS/$basearch/os/ +gpgcheck=0 +enabled=1 + +# CentOS-Extras.repo +# +# The mirror system uses the connecting IP address of the client and the +# update status of each mirror to pick mirrors that are updated to and +# geographically close to the client. You should use this for CentOS updates +# unless you are manually picking other mirrors. +# +# If the mirrorlist= does not work for you, as a fall back you can try the +# remarked out baseurl= line instead. +# +# + +#additional packages that may be useful +[extras] +name=CentOS-$releasever - Extras +baseurl=https://mirrors.ustc.edu.cn/centos/$releasever/extras/$basearch/os/ +gpgcheck=0 +enabled=1 diff --git a/DBMS/CentOS8.1.1911/mysql/8.0.17/mysql8.0.17.spec b/DBMS/CentOS8.1.1911/mysql/8.0.17/mysql8.0.17.spec index 8ef282504de872134b0f2f57e196ea6114a44565..d72c94363969a4b4d4060e01594e6ed420dec3d5 100644 --- a/DBMS/CentOS8.1.1911/mysql/8.0.17/mysql8.0.17.spec +++ b/DBMS/CentOS8.1.1911/mysql/8.0.17/mysql8.0.17.spec @@ -16,6 +16,7 @@ Summary: A very fast and reliable SQL database server %define MYSQL_USER mysql %define MYSQL_GROUP mysql +%define debug_package %{nil} %define __os_install_post %{nil} %define __debug_install_post \ %{_rpmconfigdir}/find-debuginfo.sh %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}" \ @@ -46,7 +47,7 @@ rm -rf $RPM_BUILD_DIR/* %files %defattr(-, %{MYSQL_USER}, %{MYSQL_GROUP}) -%attr(755, %{MYSQL_USER}, %{MYSQL_GROUP}) %{prefix}/* +%attr(-, %{MYSQL_USER}, %{MYSQL_GROUP}) %{prefix}/* %pre if ! id %{MYSQL_USER} > /dev/null 2>&1;then diff --git a/DBMS/CentOS8.1.1911/mysql/8.0.17/rpcsvc-proto-1.4.tar.gz b/DBMS/CentOS8.1.1911/mysql/8.0.17/rpcsvc-proto-1.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..d69ef194008ebe9ebf3b86334b1730d4b2d4dddf Binary files /dev/null and b/DBMS/CentOS8.1.1911/mysql/8.0.17/rpcsvc-proto-1.4.tar.gz differ diff --git a/Web/CentOS8.1.1911/nginx/1.14.2/Dockerfile-nginx-1.14.2 b/Web/CentOS8.1.1911/nginx/1.14.2/Dockerfile-nginx-1.14.2 index 5bc16058cf8bb4ef7baf84de580b1d3993032414..490e4dab21ba139c7c95f0c85a9d2963edb6263a 100644 --- a/Web/CentOS8.1.1911/nginx/1.14.2/Dockerfile-nginx-1.14.2 +++ b/Web/CentOS8.1.1911/nginx/1.14.2/Dockerfile-nginx-1.14.2 @@ -1,34 +1,19 @@ -# Starting from CentOS 7.6.1810 aarch64 -FROM arm64v8/centos:1911 +# Starting from CentOS 8.1.1911 aarch64 +FROM arm64v8/centos:8.1.1911 LABEL maintainer="x.zhou.qd@hotmail.com" # Compile arg - automatic ARG COMPILE_THREAD="lscpu | grep ^CPU\(s\): | awk '{print \$2}'" -# Install required packages from yum, use Huawei Cloud Mirror +# Install required packages from yum 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/. +COPY centos-altarch-8.repo /etc/yum.repos.d/. RUN yum clean all \ && yum makecache \ - && yum -y install gcc gcc-c++ make libtool zlib zlib-devel pcre pcre-devel perl-devel perl-ExtUtils-Embed perl-WWW-Curl wget initscripts net-tools rpm-build - -# Install OpenSSL -WORKDIR /home -RUN wget https://codeload.github.com/openssl/openssl/tar.gz/OpenSSL_1_1_1a --no-check-certificate \ - && mv OpenSSL_1_1_1a openssl-OpenSSL_1_1_1a.tar.gz \ - && tar -xf openssl-OpenSSL_1_1_1a.tar.gz \ - && cd openssl-OpenSSL_1_1_1a/ \ - && ./config \ - && make -j$(eval ${COMPILE_THREAD}) \ - && make -j$(eval ${COMPILE_THREAD}) install \ - && echo "/usr/local/lib/" >> /etc/ld.so.conf \ - && echo "/usr/local/lib64/" >> /etc/ld.so.conf \ - && ldconfig -v \ - && echo export PATH=/usr/local/bin:\$PATH >> /etc/profile \ - && source /etc/profile \ - && openssl version + && yum -y install epel-release \ + && yum -y install gcc gcc-c++ make libtool zlib zlib-devel pcre pcre-devel pcre2-devel perl perl-devel perl-ExtUtils-Embed perl-WWW-Curl openssl openssl-devel wget initscripts net-tools rpm-build # Install Nginx WORKDIR /root @@ -39,4 +24,4 @@ COPY nginx1.14.2.spec rpmbuild/SPECS/. ENV PERL5LIB=/root/perl5/lib/perl5: PERL_LOCAL_LIB_ROOT=:/root/perl5 PERL_MM_OPT=INSTALL_BASE=/root/perl5 CFLAGS='-fPIC' PATH=/usr/local/bin:$PATH RUN rpmbuild -bb rpmbuild/SPECS/nginx1.14.2.spec \ && mkdir -p /root/output \ - && cp rpmbuild/RPMS/aarch64/nginx-1.14.2-1.el7_4.aarch64.rpm output/. + && cp rpmbuild/RPMS/aarch64/nginx-1.14.2-1.el8_4.aarch64.rpm output/. diff --git a/Web/CentOS8.1.1911/nginx/1.14.2/centos-altarch-8.repo b/Web/CentOS8.1.1911/nginx/1.14.2/centos-altarch-8.repo new file mode 100644 index 0000000000000000000000000000000000000000..f8ec2d844e32b3b4021ec506c9505e38ba0ee5be --- /dev/null +++ b/Web/CentOS8.1.1911/nginx/1.14.2/centos-altarch-8.repo @@ -0,0 +1,54 @@ +# CentOS-AppStream.repo +# +# The mirror system uses the connecting IP address of the client and the +# update status of each mirror to pick mirrors that are updated to and +# geographically close to the client. You should use this for CentOS updates +# unless you are manually picking other mirrors. +# +# If the mirrorlist= does not work for you, as a fall back you can try the +# remarked out baseurl= line instead. +# +# + +[AppStream] +name=CentOS-$releasever - AppStream +baseurl=https://mirrors.ustc.edu.cn/centos/$releasever/AppStream/$basearch/os/ +gpgcheck=0 +enabled=1 + +# CentOS-Base.repo +# +# The mirror system uses the connecting IP address of the client and the +# update status of each mirror to pick mirrors that are updated to and +# geographically close to the client. You should use this for CentOS updates +# unless you are manually picking other mirrors. +# +# If the mirrorlist= does not work for you, as a fall back you can try the +# remarked out baseurl= line instead. +# +# + +[BaseOS] +name=CentOS-$releasever - Base +baseurl=https://mirrors.ustc.edu.cn/centos/$releasever/BaseOS/$basearch/os/ +gpgcheck=0 +enabled=1 + +# CentOS-Extras.repo +# +# The mirror system uses the connecting IP address of the client and the +# update status of each mirror to pick mirrors that are updated to and +# geographically close to the client. You should use this for CentOS updates +# unless you are manually picking other mirrors. +# +# If the mirrorlist= does not work for you, as a fall back you can try the +# remarked out baseurl= line instead. +# +# + +#additional packages that may be useful +[extras] +name=CentOS-$releasever - Extras +baseurl=https://mirrors.ustc.edu.cn/centos/$releasever/extras/$basearch/os/ +gpgcheck=0 +enabled=1 diff --git a/Web/CentOS8.1.1911/nginx/1.14.2/nginx1.14.2.spec b/Web/CentOS8.1.1911/nginx/1.14.2/nginx1.14.2.spec index ad89a6c6f853e71af5a2a1a8ddc2d6e75be8612c..a206c70bcd8a259db259f14d3079273ed2d70d69 100644 --- a/Web/CentOS8.1.1911/nginx/1.14.2/nginx1.14.2.spec +++ b/Web/CentOS8.1.1911/nginx/1.14.2/nginx1.14.2.spec @@ -1,4 +1,5 @@ %define __debug_install_post %{_rpmconfigdir}/find-debuginfo.sh %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}"%{nil} +%define debug_package %{nil} %define _topdir /root/rpmbuild %define _prefix /usr/local/nginx %define nginx_user nginx @@ -25,7 +26,7 @@ BuildRequires: perl, pcre-devel %build ./configure --prefix=%{_prefix} --with-http_ssl_module --with-http_realip_module \ --with-http_addition_module --with-http_dav_module --with-http_flv_module --with-http_mp4_module \ ---with-http_gzip_static_module --with-http_perl_module --with-pcre --with-openssl=/home/openssl-OpenSSL_1_1_1a +--with-http_gzip_static_module --with-http_perl_module --with-pcre make -j`cat /proc/cpuinfo | grep processor | wc -l` %install