Resolve almalinux8/ubuntu2004 build image ppc64le compatibility issue…

…s (part 2) (opensearch-project#4517) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Divyaasm · Mar 8, 2024 · c330f54 · c330f54
1 parent 19cb196
commit c330f54
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/docker/ci/config/windows-setup.ps1 b/docker/ci/config/windows-setup.ps1
@@ -47,7 +47,6 @@ bash.exe -c "mv -v 'C:\\Windows\\System32\\find.exe' 'C:\\Windows\\System32\\fin
 
 # Add some sleep due to a potential race condition
 Start-Sleep -Seconds 10
-Set-MpPreference -DisableRealtimeMonitoring $true
 
 # Setup Repos (This has to happen after git is installed or will error out)
 scoop bucket add java

diff --git a/docker/ci/dockerfiles/current/docker-builder.ubuntu2004.x64.dockerfile b/docker/ci/dockerfiles/current/docker-builder.ubuntu2004.x64.dockerfile
@@ -83,5 +83,5 @@ RUN curl -SL -o- https://apt.releases.hashicorp.com/gpg | gpg --dearmor > /usr/s
 
 # Tools setup
 COPY --chown=0:0 config/yq-setup.sh config/gh-setup.sh /tmp/
-RUN apt-get install -y golang-go && /tmp/yq-setup.sh && /tmp/gh-setup.sh
+RUN apt-get install -y golang-go golang-1.21-go && update-alternatives --install /usr/bin/go go /usr/lib/go-1.21/bin/go 1 && /tmp/yq-setup.sh && /tmp/gh-setup.sh