Skip to content

[MIP SDK][RHEL9] Dockerfile for Rocky Linux 9 support #1132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shivpratap1992 merged 5 commits into from
Apr 20, 2023
Merged

[MIP SDK][RHEL9] Dockerfile for Rocky Linux 9 support #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cfeb4ff
Dockerfile for Rhel 9
shivpratap1992 Apr 18, 2023
3df9900
Remove duplicate libraries from installation
shivpratap1992 Apr 18, 2023
ea158b5
Fix release build issue
shivpratap1992 Apr 18, 2023
1a46940
Fix compiler errors for google test with new gcc compiler
shivpratap1992 Apr 19, 2023
3ea9e36
Keeping original version to maintain parity with changes in OneDS
shivpratap1992 Apr 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-all.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if DEFINED GIT_PULL_TOKEN (

set GTEST_PATH=third_party\googletest
if NOT EXIST %GTEST_PATH%\CMakeLists.txt (
git clone --depth 1 --branch release-1.11.0 https://github.com/google/googletest %GTEST_PATH%
git clone --depth 1 --branch release-1.12.1 https://github.com/google/googletest %GTEST_PATH%
)

set CUSTOM_PROPS=
Expand Down
2 changes: 1 addition & 1 deletion build-gtest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ GTEST_PATH=third_party/googletest
if [ ! "$(ls -A $GTEST_PATH/CMakeLists.txt)" ]; then
echo Clone googletest from google/googletest:master ...
rm -rf ${GTEST_PATH} #delete just if empty directory exists
git clone --depth 1 --branch release-1.11.0 https://github.com/google/googletest $GTEST_PATH
git clone --depth 1 --branch release-1.12.1 https://github.com/google/googletest $GTEST_PATH
else
echo "Using existing googletest from thirdparty/"
fi
Expand Down
2 changes: 1 addition & 1 deletion build-tests.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if DEFINED GIT_PULL_TOKEN (

set GTEST_PATH=third_party\googletest
if NOT EXIST %GTEST_PATH%\CMakeLists.txt (
git clone --depth 1 --branch release-1.11.0 https://github.com/google/googletest %GTEST_PATH%
git clone --depth 1 --branch release-1.12.1 https://github.com/google/googletest %GTEST_PATH%
)

set PLATFORM=
Expand Down
12 changes: 12 additions & 0 deletions docker/rockylinux9/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
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 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
2 changes: 1 addition & 1 deletion lib/android_build/gradlew.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set APP_HOME=%DIRNAME%
set GTEST_PATH=..\..\third_party\googletest
if NOT EXIST %GTEST_PATH%\CMakeLists.txt (
rd /S /Q %GTEST_PATH%
git clone --depth 1 --branch release-1.11.0 https://github.com/google/googletest %GTEST_PATH%
git clone --depth 1 --branch release-1.12.1 https://github.com/google/googletest %GTEST_PATH%
dir %GTEST_PATH%\googletest\src\gtest-all.cc
)

Expand Down