From f8cd81e9b42e4c1bf3faba05fc089e8fde3e4dfd Mon Sep 17 00:00:00 2001 From: Shiv Pratap Singh Date: Thu, 31 Aug 2023 17:01:37 -0700 Subject: [PATCH 1/9] Fix RHEL 9 --- docker/rockylinux9/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/rockylinux9/Dockerfile b/docker/rockylinux9/Dockerfile index 82c7094e7..9b456e6c5 100644 --- a/docker/rockylinux9/Dockerfile +++ b/docker/rockylinux9/Dockerfile @@ -6,7 +6,7 @@ yum-config-manager --enable crb && \ yum update -y && \ yum -y group install "Development Tools" && \ yum install -y libcurl-devel zlib-devel clang python pkg-config git bzip2 unzip make wget sudo cmake && \ -yum -y install epel-release && \ +yum -y install epel-release --setopt=tsflags=nodocs && \ yum install -y zlib-static gmock gmock-devel gtest gtest-devel CMD /bin/bash \ No newline at end of file From b8f327e10f5b511cd632035966bbc3ac0e1e73a3 Mon Sep 17 00:00:00 2001 From: Shiv Pratap Singh Date: Thu, 31 Aug 2023 17:39:42 -0700 Subject: [PATCH 2/9] Fix --- docker/rockylinux9/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/rockylinux9/Dockerfile b/docker/rockylinux9/Dockerfile index 9b456e6c5..0ece78fcc 100644 --- a/docker/rockylinux9/Dockerfile +++ b/docker/rockylinux9/Dockerfile @@ -5,8 +5,8 @@ RUN yum install -y yum-utils && \ yum-config-manager --enable crb && \ yum update -y && \ yum -y group install "Development Tools" && \ -yum install -y libcurl-devel zlib-devel clang python pkg-config git bzip2 unzip make wget sudo cmake && \ +yum install -y --setopt=tsflags=nodocs libcurl-devel zlib-devel clang python pkg-config git bzip2 unzip make wget sudo cmake && \ yum -y install epel-release --setopt=tsflags=nodocs && \ -yum install -y zlib-static gmock gmock-devel gtest gtest-devel +yum install -y --setopt=tsflags=nodocs zlib-static gmock gmock-devel gtest gtest-devel CMD /bin/bash \ No newline at end of file From 1b59726f9d8eaf2de1f101498033102f313ba6de Mon Sep 17 00:00:00 2001 From: Shiv Pratap Singh Date: Thu, 31 Aug 2023 18:05:08 -0700 Subject: [PATCH 3/9] Fix --- docker/rockylinux9/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/rockylinux9/Dockerfile b/docker/rockylinux9/Dockerfile index 0ece78fcc..e6a3e552d 100644 --- a/docker/rockylinux9/Dockerfile +++ b/docker/rockylinux9/Dockerfile @@ -6,7 +6,7 @@ yum-config-manager --enable crb && \ yum update -y && \ yum -y group install "Development Tools" && \ yum install -y --setopt=tsflags=nodocs libcurl-devel zlib-devel clang python pkg-config git bzip2 unzip make wget sudo cmake && \ -yum -y install epel-release --setopt=tsflags=nodocs && \ +yum -y install --setopt=tsflags=nodocs epel-release && \ yum install -y --setopt=tsflags=nodocs zlib-static gmock gmock-devel gtest gtest-devel CMD /bin/bash \ No newline at end of file From 6453db467ee3321e96d03723f7e0f890f515f7bb Mon Sep 17 00:00:00 2001 From: Shiv Pratap Singh Date: Thu, 31 Aug 2023 18:24:12 -0700 Subject: [PATCH 4/9] Fix --- docker/rockylinux9/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/rockylinux9/Dockerfile b/docker/rockylinux9/Dockerfile index e6a3e552d..bb05a75b8 100644 --- a/docker/rockylinux9/Dockerfile +++ b/docker/rockylinux9/Dockerfile @@ -5,7 +5,7 @@ RUN yum install -y yum-utils && \ yum-config-manager --enable crb && \ yum update -y && \ yum -y group install "Development Tools" && \ -yum install -y --setopt=tsflags=nodocs libcurl-devel zlib-devel clang python pkg-config git bzip2 unzip make wget sudo cmake && \ +yum install -y --setopt=tsflags=nodocs libcurl-devel zlib-devel clang python pkg-config git bzip2 unzip make wget sudo cmake perl-IPC-Cmd && \ yum -y install --setopt=tsflags=nodocs epel-release && \ yum install -y --setopt=tsflags=nodocs zlib-static gmock gmock-devel gtest gtest-devel From c7ca0e224f35247baece3fad1e0b901ba4d5219e Mon Sep 17 00:00:00 2001 From: Shiv Pratap Singh Date: Thu, 31 Aug 2023 18:52:41 -0700 Subject: [PATCH 5/9] Fix --- docker/rockylinux9/Dockerfile | 99 ++++++++++++++++++++++++++++++----- 1 file changed, 87 insertions(+), 12 deletions(-) diff --git a/docker/rockylinux9/Dockerfile b/docker/rockylinux9/Dockerfile index bb05a75b8..9193c4583 100644 --- a/docker/rockylinux9/Dockerfile +++ b/docker/rockylinux9/Dockerfile @@ -1,12 +1,87 @@ -FROM mipsdkcontainer.azurecr.io/rockylinux9 - -## Common packages for linux build environment -RUN yum install -y yum-utils && \ -yum-config-manager --enable crb && \ -yum update -y && \ -yum -y group install "Development Tools" && \ -yum install -y --setopt=tsflags=nodocs libcurl-devel zlib-devel clang python pkg-config git bzip2 unzip make wget sudo cmake perl-IPC-Cmd && \ -yum -y install --setopt=tsflags=nodocs epel-release && \ -yum install -y --setopt=tsflags=nodocs zlib-static gmock gmock-devel gtest gtest-devel - -CMD /bin/bash \ No newline at end of file +FROM mipsdkcontainer.azurecr.io/library/rockylinux:9 + +# Install Dependencies +RUN \ + yum install -y yum-utils && \ + yum-config-manager --enable crb && \ + yum -y update && \ + yum -y install epel-release && \ + yum -y group install "Development Tools" && \ + yum -y install git libgsf libgsf-devel libxml2-devel libcurl-devel wget gdk-pixbuf2 glib2-devel libuuid-devel && \ + yum -y install libsecret libsecret-devel gnome-keyring + +RUN \ + dnf -y install python3.9 python3-pip && \ + echo 'alias python="/bin/python3"' >> ~/.bashrc && \ + echo 'alias python="/bin/python3"' >> ~/.bash_profile && \ + pip3 install scons && \ + pip3 install distro && \ + ln -fs /bin/python3.9 /bin/python + +# openssl +ENV OPENSSL_VERSION 1_1_1r +RUN \ + dnf install -y perl-FindBin && \ + dnf install -y perl-File-Compare && \ + curl -O -L https://github.com/openssl/openssl/archive/refs/tags/OpenSSL_$OPENSSL_VERSION.tar.gz && \ + echo "fc513913724790510f53af07caa24eaf0eae3fc8cf476c17c113221b5868edac OpenSSL_$OPENSSL_VERSION.tar.gz" | sha256sum -c && \ + tar -xzvf OpenSSL_$OPENSSL_VERSION.tar.gz && \ + cd openssl-OpenSSL_$OPENSSL_VERSION && \ + ./config --prefix=/usr/mip --libdir=/usr/mip/lib --openssldir=/etc/ssl no-shared no-ssl2 no-ssl3 no-comp zlib-dynamic enable-ec_nistp_64_gcc_128 && \ + make -j$(nproc) && \ + make install_sw && \ + cd .. && rm -f OpenSSL_$OPENSSL_VERSION.tar.gz && rm -rf openssl-OpenSSL_$OPENSSL_VERSION + +# Boost +RUN \ + wget -nv -q https://boostorg.jfrog.io/artifactory/main/release/1.67.0/source/boost_1_67_0.tar.gz && \ + echo '8aa4e330c870ef50a896634c931adf468b21f8a69b77007e45c444151229f665 boost_1_67_0.tar.gz' | sha256sum -c && \ + tar -xzf boost_1_67_0.tar.gz && \ + cd boost_1_67_0 && \ + ./bootstrap.sh --prefix=/usr --libdir=/usr/lib64 cxxflags=-fPIC cflags=-fPIC link=static --with-libraries=chrono,random,system,thread,filesystem,atomic,date_time,regex && \ + ./b2 install --prefix=/usr --libdir=/usr/lib64 cxxflags=-fPIC cflags=-fPIC link=static -j$(nproc) && \ + cd .. && rm -f boost_1_67_0.tar.gz && rm -rf boost_1_67_0 + + +# Swig +RUN \ + wget https://sourceforge.net/projects/swig/files/swig/swig-4.0.2/swig-4.0.2.tar.gz/download && \ + tar xzvf download && \ + cd swig-4.0.2 && \ + ./configure && \ + make && \ + make install && \ + cd .. && rm -f download && rm -rf swig-4.0.2 + +# Nuget +RUN \ + dnf install -y mono-devel mono-complete && \ + curl -o /usr/local/bin/nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe && \ + echo 'alias nuget="mono /usr/local/bin/nuget.exe"' >> ~/.bashrc && \ + echo 'alias nuget="mono /usr/local/bin/nuget.exe"' >> ~/.bash_profile + +# Cmake +RUN \ + wget https://cmake.org/files/v3.24/cmake-3.24.1.tar.gz && \ + tar -xzvf cmake-3.24.1.tar.gz && \ + cd cmake-3.24.1 && \ + export OPENSSL_ROOT_DIR=/usr/mip && \ + ./bootstrap && \ + make -j$(nproc) && \ + make install && \ + cd .. && rm -f cmake-3.24.1.tar.gz && rm -rf cmake-3.24.1 + +# dotnet +RUN \ + rpm --import https://packages.microsoft.com/keys/microsoft.asc && \ + wget https://packages.microsoft.com/config/rhel/9.0/prod.repo -O /etc/yum.repos.d/microsoft-prod.repo && \ + dnf install -y openssl-devel && \ + dnf install -y dotnet-sdk-6.0 aspnetcore-runtime-6.0 dotnet-runtime-6.0 + +# For Agnostic testing +RUN \ + rm -rf /etc/ssl && \ + ln -s /etc/pki/tls /etc/ssl + +EXPOSE 80 +EXPOSE 443 \ No newline at end of file From 2bc89937feda26ce5c84577772d3f4cad6d2528c Mon Sep 17 00:00:00 2001 From: Shiv Pratap Singh Date: Thu, 31 Aug 2023 18:58:35 -0700 Subject: [PATCH 6/9] Fix --- docker/rockylinux9/Dockerfile | 59 ----------------------------------- 1 file changed, 59 deletions(-) diff --git a/docker/rockylinux9/Dockerfile b/docker/rockylinux9/Dockerfile index 9193c4583..0c8e7e402 100644 --- a/docker/rockylinux9/Dockerfile +++ b/docker/rockylinux9/Dockerfile @@ -10,14 +10,6 @@ RUN \ yum -y install git libgsf libgsf-devel libxml2-devel libcurl-devel wget gdk-pixbuf2 glib2-devel libuuid-devel && \ yum -y install libsecret libsecret-devel gnome-keyring -RUN \ - dnf -y install python3.9 python3-pip && \ - echo 'alias python="/bin/python3"' >> ~/.bashrc && \ - echo 'alias python="/bin/python3"' >> ~/.bash_profile && \ - pip3 install scons && \ - pip3 install distro && \ - ln -fs /bin/python3.9 /bin/python - # openssl ENV OPENSSL_VERSION 1_1_1r RUN \ @@ -32,56 +24,5 @@ RUN \ make install_sw && \ cd .. && rm -f OpenSSL_$OPENSSL_VERSION.tar.gz && rm -rf openssl-OpenSSL_$OPENSSL_VERSION -# Boost -RUN \ - wget -nv -q https://boostorg.jfrog.io/artifactory/main/release/1.67.0/source/boost_1_67_0.tar.gz && \ - echo '8aa4e330c870ef50a896634c931adf468b21f8a69b77007e45c444151229f665 boost_1_67_0.tar.gz' | sha256sum -c && \ - tar -xzf boost_1_67_0.tar.gz && \ - cd boost_1_67_0 && \ - ./bootstrap.sh --prefix=/usr --libdir=/usr/lib64 cxxflags=-fPIC cflags=-fPIC link=static --with-libraries=chrono,random,system,thread,filesystem,atomic,date_time,regex && \ - ./b2 install --prefix=/usr --libdir=/usr/lib64 cxxflags=-fPIC cflags=-fPIC link=static -j$(nproc) && \ - cd .. && rm -f boost_1_67_0.tar.gz && rm -rf boost_1_67_0 - - -# Swig -RUN \ - wget https://sourceforge.net/projects/swig/files/swig/swig-4.0.2/swig-4.0.2.tar.gz/download && \ - tar xzvf download && \ - cd swig-4.0.2 && \ - ./configure && \ - make && \ - make install && \ - cd .. && rm -f download && rm -rf swig-4.0.2 - -# Nuget -RUN \ - dnf install -y mono-devel mono-complete && \ - curl -o /usr/local/bin/nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe && \ - echo 'alias nuget="mono /usr/local/bin/nuget.exe"' >> ~/.bashrc && \ - echo 'alias nuget="mono /usr/local/bin/nuget.exe"' >> ~/.bash_profile - -# Cmake -RUN \ - wget https://cmake.org/files/v3.24/cmake-3.24.1.tar.gz && \ - tar -xzvf cmake-3.24.1.tar.gz && \ - cd cmake-3.24.1 && \ - export OPENSSL_ROOT_DIR=/usr/mip && \ - ./bootstrap && \ - make -j$(nproc) && \ - make install && \ - cd .. && rm -f cmake-3.24.1.tar.gz && rm -rf cmake-3.24.1 - -# dotnet -RUN \ - rpm --import https://packages.microsoft.com/keys/microsoft.asc && \ - wget https://packages.microsoft.com/config/rhel/9.0/prod.repo -O /etc/yum.repos.d/microsoft-prod.repo && \ - dnf install -y openssl-devel && \ - dnf install -y dotnet-sdk-6.0 aspnetcore-runtime-6.0 dotnet-runtime-6.0 - -# For Agnostic testing -RUN \ - rm -rf /etc/ssl && \ - ln -s /etc/pki/tls /etc/ssl - EXPOSE 80 EXPOSE 443 \ No newline at end of file From 210c1686efeb4308a745a3c027f12ed16f6307c5 Mon Sep 17 00:00:00 2001 From: Shiv Pratap Singh Date: Thu, 31 Aug 2023 19:39:10 -0700 Subject: [PATCH 7/9] Fix build --- docker/rockylinux9/Dockerfile | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/docker/rockylinux9/Dockerfile b/docker/rockylinux9/Dockerfile index 0c8e7e402..37afb2ec0 100644 --- a/docker/rockylinux9/Dockerfile +++ b/docker/rockylinux9/Dockerfile @@ -7,22 +7,21 @@ RUN \ yum -y update && \ yum -y install epel-release && \ yum -y group install "Development Tools" && \ - yum -y install git libgsf libgsf-devel libxml2-devel libcurl-devel wget gdk-pixbuf2 glib2-devel libuuid-devel && \ + yum -y install git libgsf libgsf-devel libxml2-devel libcurl-devel wget gdk-pixbuf2 glib2-devel libuuid-devel perl-IPC-Cmd && \ yum -y install libsecret libsecret-devel gnome-keyring # openssl -ENV OPENSSL_VERSION 1_1_1r +ENV OPENSSL_VERSION 3.0.9 RUN \ dnf install -y perl-FindBin && \ dnf install -y perl-File-Compare && \ - curl -O -L https://github.com/openssl/openssl/archive/refs/tags/OpenSSL_$OPENSSL_VERSION.tar.gz && \ - echo "fc513913724790510f53af07caa24eaf0eae3fc8cf476c17c113221b5868edac OpenSSL_$OPENSSL_VERSION.tar.gz" | sha256sum -c && \ - tar -xzvf OpenSSL_$OPENSSL_VERSION.tar.gz && \ - cd openssl-OpenSSL_$OPENSSL_VERSION && \ + curl -O -L https://github.com/openssl/openssl/archive/refs/tags/openssl-$OPENSSL_VERSION.tar.gz && \ + echo "2eec31f2ac0e126ff68d8107891ef534159c4fcfb095365d4cd4dc57d82616ee openssl-$OPENSSL_VERSION.tar.gz" | sha256sum -c && \ + tar -xzvf openssl-$OPENSSL_VERSION.tar.gz && \ + cd openssl-openssl-$OPENSSL_VERSION && \ ./config --prefix=/usr/mip --libdir=/usr/mip/lib --openssldir=/etc/ssl no-shared no-ssl2 no-ssl3 no-comp zlib-dynamic enable-ec_nistp_64_gcc_128 && \ make -j$(nproc) && \ make install_sw && \ - cd .. && rm -f OpenSSL_$OPENSSL_VERSION.tar.gz && rm -rf openssl-OpenSSL_$OPENSSL_VERSION + cd .. && rm -f openssl-$OPENSSL_VERSION.tar.gz && rm -rf openssl-openssl-$OPENSSL_VERSION -EXPOSE 80 -EXPOSE 443 \ No newline at end of file +CMD /bin/bash \ No newline at end of file From e2192fec950cdd6f802b775bfe6ebab52e9a825d Mon Sep 17 00:00:00 2001 From: Shiv Pratap Singh Date: Thu, 31 Aug 2023 20:42:18 -0700 Subject: [PATCH 8/9] Fix --- docker/rockylinux9/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/rockylinux9/Dockerfile b/docker/rockylinux9/Dockerfile index 37afb2ec0..9353402d0 100644 --- a/docker/rockylinux9/Dockerfile +++ b/docker/rockylinux9/Dockerfile @@ -1,4 +1,4 @@ -FROM mipsdkcontainer.azurecr.io/library/rockylinux:9 +FROM mipsdkcontainer.azurecr.io/rockylinux9 # Install Dependencies RUN \ From 82a9d15d80dc96c60e1ff1e66239ac5671f0bd07 Mon Sep 17 00:00:00 2001 From: Shiv Pratap Singh Date: Thu, 31 Aug 2023 22:15:22 -0700 Subject: [PATCH 9/9] Fix --- docker/rockylinux9/Dockerfile | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/docker/rockylinux9/Dockerfile b/docker/rockylinux9/Dockerfile index 9353402d0..8aa2eb3d9 100644 --- a/docker/rockylinux9/Dockerfile +++ b/docker/rockylinux9/Dockerfile @@ -1,27 +1,12 @@ FROM mipsdkcontainer.azurecr.io/rockylinux9 -# Install Dependencies -RUN \ - yum install -y yum-utils && \ - yum-config-manager --enable crb && \ - yum -y update && \ - yum -y install epel-release && \ - yum -y group install "Development Tools" && \ - yum -y install git libgsf libgsf-devel libxml2-devel libcurl-devel wget gdk-pixbuf2 glib2-devel libuuid-devel perl-IPC-Cmd && \ - yum -y install libsecret libsecret-devel gnome-keyring - -# openssl -ENV OPENSSL_VERSION 3.0.9 -RUN \ - dnf install -y perl-FindBin && \ - dnf install -y perl-File-Compare && \ - curl -O -L https://github.com/openssl/openssl/archive/refs/tags/openssl-$OPENSSL_VERSION.tar.gz && \ - echo "2eec31f2ac0e126ff68d8107891ef534159c4fcfb095365d4cd4dc57d82616ee openssl-$OPENSSL_VERSION.tar.gz" | sha256sum -c && \ - tar -xzvf openssl-$OPENSSL_VERSION.tar.gz && \ - cd openssl-openssl-$OPENSSL_VERSION && \ - ./config --prefix=/usr/mip --libdir=/usr/mip/lib --openssldir=/etc/ssl no-shared no-ssl2 no-ssl3 no-comp zlib-dynamic enable-ec_nistp_64_gcc_128 && \ - make -j$(nproc) && \ - make install_sw && \ - cd .. && rm -f openssl-$OPENSSL_VERSION.tar.gz && rm -rf openssl-openssl-$OPENSSL_VERSION +## Common packages for linux build environment +RUN yum install -y yum-utils && \ +yum-config-manager --enable crb && \ +yum clean all && \ +yum -y group install "Development Tools" && \ +yum install -y libcurl-devel zlib-devel clang python pkg-config git bzip2 unzip make wget sudo cmake && \ +yum -y install epel-release && \ +yum install -y zlib-static gmock gmock-devel gtest gtest-devel CMD /bin/bash \ No newline at end of file