Resolve almalinux8/ubuntu2004 build image ppc64le compatibility issues (

#4514)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

docker/ci/config/gh-setup.sh

@@ -27,7 +27,7 @@ function gh_install_ppc64le {
     GO_VERSION=`go version | cut -d ' ' -f3 | tr -d 'go'`
     GO_REQUIRED_VERSION="1.21.0"
     COMPARE_VERSION=`echo $GO_REQUIRED_VERSION $GO_VERSION | tr ' ' '\n' | sort -V | uniq | head -n 1`
-    if [ "$COMPARE_VERSION" != "$GCC_REQUIRED_VERSION" ]; then
+    if [ "$COMPARE_VERSION" != "$GO_REQUIRED_VERSION" ]; then
         VERSION=2.32.1
         echo "go version on this env is older than $GO_REQUIRED_VERSION, use gh $VERSION"
     fi

docker/ci/dockerfiles/current/build.almalinux8.opensearch-dashboards.x64.arm64.dockerfile

@@ -24,10 +24,6 @@ RUN dnf clean all && dnf install -y 'dnf-command(config-manager)' && \
     dnf update -y && \
     dnf install -y which curl git gnupg2 tar net-tools procps-ng python39 python39-devel python39-pip zip unzip jq
 
-# Tools setup
-COPY --chown=0:0 config/yq-setup.sh config/gh-setup.sh /tmp/
-RUN dnf install -y go && /tmp/yq-setup.sh && /tmp/gh-setup.sh
-
 # Create user group
 RUN groupadd -g 1000 $CONTAINER_USER && \
     useradd -u 1000 -g 1000 -d $CONTAINER_USER_HOME $CONTAINER_USER && \
@@ -41,11 +37,15 @@ RUN dnf install -y @development zlib-devel bzip2 bzip2-devel readline-devel sqli
 RUN dnf install -y xorg-x11-server-Xvfb gtk2-devel gtk3-devel libnotify-devel GConf2 nss libXScrnSaver alsa-lib
 
 # Add Notebook dependencies
-RUN dnf install -y nss xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-utils xorg-x11-fonts-cyrillic xorg-x11-fonts-Type1 xorg-x11-fonts-misc fontconfig freetype && yum clean all
+RUN dnf install -y nss xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-utils xorg-x11-fonts-cyrillic xorg-x11-fonts-Type1 xorg-x11-fonts-misc fontconfig freetype && dnf clean all
 
 # Add Yarn dependencies
 RUN dnf groupinstall -y "Development Tools" && dnf clean all && rm -rf /var/cache/dnf/*
 
+# Tools setup
+COPY --chown=0:0 config/yq-setup.sh config/gh-setup.sh /tmp/
+RUN dnf install -y go && /tmp/yq-setup.sh && /tmp/gh-setup.sh
+
 # Setup Shared Memory
 RUN chmod -R 777 /dev/shm
 

docker/ci/dockerfiles/current/build.ubuntu2004.opensearch.x64.arm64.dockerfile

@@ -29,11 +29,12 @@ RUN apt-get update -y && apt-get upgrade -y && apt-get install -y docker.io curl
     apt-get install -y debmake debhelper-compat && \
     apt-get install -y libxrender1 libxtst6 libasound2 libxi6 libgconf-2-4 && \
     apt-get install -y libatk1.0-0 libatk-bridge2.0-0 libcups2 libdrm2 libatspi2.0-dev libxcomposite-dev libxdamage1 libxfixes3 libxfixes-dev libxrandr2 libgbm-dev libxkbcommon-x11-0 libpangocairo-1.0-0 libcairo2 libcairo2-dev libnss3 libnspr4 libnspr4-dev freeglut3 && \
+    apt-get install -y docker-compose && \
     apt-get clean -y
 
 # Install pip packages
 RUN curl -SL https://bootstrap.pypa.io/get-pip.py | python && \
-    pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.32.17 docker-compose==1.29.2
+    pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.32.17
 
 # Install aptly and required changes to debmake
 # Remove lintian for now due to it takes nearly 20 minutes for OpenSearch as well as nearly an hour for OpenSearch-Dashboards during debmake
@@ -44,7 +45,7 @@ RUN curl -o- https://www.aptly.info/pubkey.txt | apt-key add - && \
 
 # Tools setup
 COPY --chown=0:0 config/jdk-setup.sh config/yq-setup.sh config/gh-setup.sh /tmp/
-RUN apt-get install -y golang-go && /tmp/jdk-setup.sh && /tmp/yq-setup.sh && /tmp/gh-setup.sh # Ubuntu has a bug where entrypoint=bash does not actually run .bashrc correctly
+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/jdk-setup.sh && /tmp/yq-setup.sh && /tmp/gh-setup.sh # Ubuntu has a bug where entrypoint=bash does not actually run .bashrc correctly
 
 # Create user group
 RUN groupadd -g 1000 $CONTAINER_USER && \