diff --git a/Dockerfile b/Dockerfile index 482733a..459ccc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,8 @@ LABEL org.opencontainers.image.source https://github.com/castisdev/docker-centos # Install EPEL repo RUN yum install -y epel-release; yum -y clean all +RUN yum install -y http://opensource.wandisco.com/centos/7/git/x86_64/wandisco-git-release-7-2.noarch.rpm; yum -y clean all + # Install RUN yum install -y \ sudo \ @@ -50,23 +52,23 @@ RUN yum install -y \ ADD install_xercesc280.sh /script/ RUN /script/install_xercesc280.sh -ADD install_cmake3212.sh /script/ -RUN /script/install_cmake3212.sh +ADD install_cmake3221.sh /script/ +RUN /script/install_cmake3221.sh -ADD install_cryptopp850.sh /script/ -RUN /script/install_cryptopp850.sh +ADD install_cryptopp860.sh /script/ +RUN /script/install_cryptopp860.sh ADD install_googletest1100.sh /script/ RUN /script/install_googletest1100.sh -ADD install_python396.sh /script/ -RUN /script/install_python396.sh +ADD install_python399.sh /script/ +RUN /script/install_python399.sh ADD install_cpptools.sh /script/ RUN /script/install_cpptools.sh -ADD install_cppcheck25.sh /script/ -RUN /script/install_cppcheck25.sh +ADD install_cppcheck26.sh /script/ +RUN /script/install_cppcheck26.sh ADD install_zsh58.sh /script/ RUN /script/install_zsh58.sh @@ -74,8 +76,8 @@ RUN /script/install_zsh58.sh ADD install_ninja1102.sh /script/ RUN /script/install_ninja1102.sh -ADD install_ffmpeg44.sh /script/ -RUN /script/install_ffmpeg44.sh +ADD install_ffmpeg441.sh /script/ +RUN /script/install_ffmpeg441.sh # set timezone RUN ln -snf /usr/share/zoneinfo/Asia/Seoul /etc/localtime diff --git a/install_cmake3212.sh b/install_cmake3212.sh deleted file mode 100755 index ddb7028..0000000 --- a/install_cmake3212.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -e -set -x #echo on -cd ~ -wget -nv https://github.com/Kitware/CMake/releases/download/v3.21.2/cmake-3.21.2-linux-x86_64.sh --no-check-certificate -chmod +x cmake-3.21.2-linux-x86_64.sh -./cmake-3.21.2-linux-x86_64.sh --skip-license --prefix=/usr/local -cmake --version -cd ~ -rm -rf cmake-* diff --git a/install_cmake3221.sh b/install_cmake3221.sh new file mode 100755 index 0000000..fd3d8dc --- /dev/null +++ b/install_cmake3221.sh @@ -0,0 +1,9 @@ +#!/bin/bash -e +set -x #echo on +cd ~ +wget -nv https://github.com/Kitware/CMake/releases/download/v3.22.1/cmake-3.22.1-linux-x86_64.sh --no-check-certificate +chmod +x cmake-3.22.1-linux-x86_64.sh +./cmake-3.22.1-linux-x86_64.sh --skip-license --prefix=/usr/local +cmake --version +cd ~ +rm -rf cmake-* diff --git a/install_cppcheck25.sh b/install_cppcheck26.sh similarity index 71% rename from install_cppcheck25.sh rename to install_cppcheck26.sh index 2d274d9..8b9452e 100755 --- a/install_cppcheck25.sh +++ b/install_cppcheck26.sh @@ -2,9 +2,9 @@ set -x #echo on cd ~ yum -y install bzip2; yum -y clean all -wget -nv --no-check-certificate --content-disposition https://github.com/danmar/cppcheck/archive/2.5.tar.gz -tar xf cppcheck-2.5.tar.gz -cd cppcheck-2.5 +wget -nv --no-check-certificate --content-disposition https://github.com/danmar/cppcheck/archive/2.6.tar.gz +tar xf cppcheck-2.6.tar.gz +cd cppcheck-2.6 mkdir build;cd build;cmake ..;make install -j$(nproc) cd ~ rm -rf cppcheck* diff --git a/install_cryptopp850.sh b/install_cryptopp860.sh similarity index 86% rename from install_cryptopp850.sh rename to install_cryptopp860.sh index 65facf3..665bd29 100755 --- a/install_cryptopp850.sh +++ b/install_cryptopp860.sh @@ -1,8 +1,8 @@ #!/bin/bash -e set -x #echo on cd ~ -wget -nv --no-check-certificate https://www.cryptopp.com/cryptopp850.zip -unzip cryptopp850.zip -d cryptopp +wget -nv --no-check-certificate https://www.cryptopp.com/cryptopp860.zip +unzip cryptopp860.zip -d cryptopp cd cryptopp sed -e s/march=native/march=x86-64/g GNUmakefile > tmp_make mv -f tmp_make GNUmakefile diff --git a/install_ffmpeg44.sh b/install_ffmpeg441.sh similarity index 82% rename from install_ffmpeg44.sh rename to install_ffmpeg441.sh index 99d7667..82810a9 100755 --- a/install_ffmpeg44.sh +++ b/install_ffmpeg441.sh @@ -2,9 +2,9 @@ set -x #echo on yum -y install libxml2-devel SDL2-devel alsa-lib-devel libXv-devel libX11-devel libXext-devel autoconf automake libtool yasm nasm; yum -y clean all cd ~ -wget -nv --no-check-certificate https://ffmpeg.org/releases/ffmpeg-4.4.tar.bz2 -tar xf ffmpeg-4.4.tar.bz2 -cd ffmpeg-4.4 +wget -nv --no-check-certificate https://ffmpeg.org/releases/ffmpeg-4.4.1.tar.bz2 +tar xf ffmpeg-4.4.1.tar.bz2 +cd ffmpeg-4.4.1 ./configure --enable-libxml2 --enable-shared make install -j$(nproc) @@ -12,4 +12,4 @@ echo "/usr/local/lib" >> /etc/ld.so.conf.d/ffmpeg.conf ldconfig cd ~ -rm -rf ffmpeg-4.4* +rm -rf ffmpeg-4.4.1* diff --git a/install_python396.sh b/install_python399.sh similarity index 76% rename from install_python396.sh rename to install_python399.sh index 4daa28c..ce8e346 100755 --- a/install_python396.sh +++ b/install_python399.sh @@ -3,9 +3,9 @@ set -x #echo on cd ~ yum install -y zlib-devel bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel gdbm-devel db4-devel libpcap-devel xz-devel libffi-devel; yum clean all -y -wget -nv https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tar.xz -tar xf Python-3.9.6.tar.xz -cd Python-3.9.6 +wget -nv https://www.python.org/ftp/python/3.9.9/Python-3.9.9.tar.xz +tar xf Python-3.9.9.tar.xz +cd Python-3.9.9 ./configure --prefix=/usr/local make install -j$(nproc) cd ~