diff --git a/docker/ci/dockerfiles/current/build.centos7.opensearch.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/build.centos7.opensearch.x64.arm64.dockerfile index 5b4eba2056..6db99b116a 100644 --- a/docker/ci/dockerfiles/current/build.centos7.opensearch.x64.arm64.dockerfile +++ b/docker/ci/dockerfiles/current/build.centos7.opensearch.x64.arm64.dockerfile @@ -45,7 +45,7 @@ RUN yum groupinstall -y "Development Tools" && yum clean all && rm -rf /var/cach # Tools setup COPY --chown=0:0 config/jdk-setup.sh config/yq-setup.sh config/gh-setup.sh /tmp/ -RUN /tmp/jdk-setup.sh && /tmp/yq-setup.sh && /tmp/gh-setup.sh +RUN yum install -y go && /tmp/jdk-setup.sh && /tmp/yq-setup.sh && /tmp/gh-setup.sh # Install higher version of maven 3.8.x RUN export MAVEN_URL=`curl -s https://maven.apache.org/download.cgi | grep -Eo '["\047].*.bin.tar.gz["\047]' | tr -d '"' | uniq | head -n 1` && \ diff --git a/docker/ci/dockerfiles/current/build.rockylinux8.opensearch-dashboards.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/build.rockylinux8.opensearch-dashboards.x64.arm64.dockerfile index 5a79a8d208..c0142010d0 100644 --- a/docker/ci/dockerfiles/current/build.rockylinux8.opensearch-dashboards.x64.arm64.dockerfile +++ b/docker/ci/dockerfiles/current/build.rockylinux8.opensearch-dashboards.x64.arm64.dockerfile @@ -26,7 +26,7 @@ RUN dnf clean all && dnf install -y 'dnf-command(config-manager)' && \ # Tools setup COPY --chown=0:0 config/yq-setup.sh config/gh-setup.sh /tmp/ -RUN /tmp/yq-setup.sh && /tmp/gh-setup.sh +RUN dnf install -y go && /tmp/yq-setup.sh && /tmp/gh-setup.sh # Create user group RUN groupadd -g 1000 $CONTAINER_USER && \ diff --git a/docker/ci/dockerfiles/current/build.rockylinux8.opensearch.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/build.rockylinux8.opensearch.x64.arm64.dockerfile index c6417223bd..3734737a7d 100644 --- a/docker/ci/dockerfiles/current/build.rockylinux8.opensearch.x64.arm64.dockerfile +++ b/docker/ci/dockerfiles/current/build.rockylinux8.opensearch.x64.arm64.dockerfile @@ -44,7 +44,7 @@ RUN dnf groupinstall -y "Development Tools" && dnf clean all && rm -rf /var/cach # Tools setup COPY --chown=0:0 config/jdk-setup.sh config/yq-setup.sh config/gh-setup.sh /tmp/ -RUN /tmp/jdk-setup.sh && /tmp/yq-setup.sh && /tmp/gh-setup.sh +RUN dnf install -y go && /tmp/jdk-setup.sh && /tmp/yq-setup.sh && /tmp/gh-setup.sh # Install higher version of maven 3.8.x RUN export MAVEN_URL=`curl -s https://maven.apache.org/download.cgi | grep -Eo '["\047].*.bin.tar.gz["\047]' | tr -d '"' | uniq | head -n 1` && \ diff --git a/docker/ci/dockerfiles/current/build.ubuntu2004.opensearch.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/build.ubuntu2004.opensearch.x64.arm64.dockerfile index 87cd190284..6ac4232f75 100644 --- a/docker/ci/dockerfiles/current/build.ubuntu2004.opensearch.x64.arm64.dockerfile +++ b/docker/ci/dockerfiles/current/build.ubuntu2004.opensearch.x64.arm64.dockerfile @@ -15,7 +15,7 @@ ARG CONTAINER_USER=ci-runner ARG CONTAINER_USER_HOME=/home/ci-runner # Install python dependencies -RUN apt-get update -y && apt-get install -y software-properties-common +RUN apt-get update -y && apt-get install -y software-properties-common && add-apt-repository ppa:longsleep/golang-backports -y # Install python binaries RUN apt-get update -y && apt-get install python3 && \ @@ -44,7 +44,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 /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 && /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 && \ diff --git a/docker/ci/dockerfiles/current/docker-builder.ubuntu2004.x64.dockerfile b/docker/ci/dockerfiles/current/docker-builder.ubuntu2004.x64.dockerfile index 97aae09cc2..18884c9d91 100644 --- a/docker/ci/dockerfiles/current/docker-builder.ubuntu2004.x64.dockerfile +++ b/docker/ci/dockerfiles/current/docker-builder.ubuntu2004.x64.dockerfile @@ -21,7 +21,7 @@ ARG CONTAINER_USER=ci-runner ARG CONTAINER_USER_HOME=/home/ci-runner # Import necessary repository for installing qemu 5.0 -RUN apt-get update -y && apt-get install -y software-properties-common && add-apt-repository ppa:jacob/virtualisation -y +RUN apt-get update -y && apt-get install -y software-properties-common && add-apt-repository ppa:jacob/virtualisation -y && add-apt-repository ppa:longsleep/golang-backports -y # Install necessary packages RUN apt-get update -y && apt-get upgrade -y && apt-get install -y binfmt-support qemu qemu-user qemu-user-static docker.io curl python3-pip && \ @@ -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 /tmp/yq-setup.sh && /tmp/gh-setup.sh +RUN apt-get install -y golang-go && /tmp/yq-setup.sh && /tmp/gh-setup.sh diff --git a/docker/ci/dockerfiles/current/release.centos7.clients.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/release.centos7.clients.x64.arm64.dockerfile index b0ca388110..c16441faf8 100644 --- a/docker/ci/dockerfiles/current/release.centos7.clients.x64.arm64.dockerfile +++ b/docker/ci/dockerfiles/current/release.centos7.clients.x64.arm64.dockerfile @@ -55,7 +55,7 @@ ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib # Tools setup COPY --chown=0:0 config/yq-setup.sh config/gh-setup.sh /tmp/ -RUN /tmp/yq-setup.sh && /tmp/gh-setup.sh +RUN yum install -y go && /tmp/yq-setup.sh && /tmp/gh-setup.sh # Install JDK RUN curl -SL https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz -o /opt/jdk11.tar.gz && \ diff --git a/docker/ci/dockerfiles/current/test.rockylinux8.opensearch-dashboards.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/test.rockylinux8.opensearch-dashboards.x64.arm64.dockerfile index 1ade330b7f..5c5bc2faf3 100644 --- a/docker/ci/dockerfiles/current/test.rockylinux8.opensearch-dashboards.x64.arm64.dockerfile +++ b/docker/ci/dockerfiles/current/test.rockylinux8.opensearch-dashboards.x64.arm64.dockerfile @@ -18,15 +18,15 @@ ARG CONTAINER_USER_HOME=/home/ci-runner USER 0 # Add normal dependencies -RUN yum clean all && \ - yum update -y && \ - yum install -y which curl git gnupg2 tar net-tools procps-ng python39 python39-devel python39-pip zip unzip +RUN dnf clean all && \ + dnf update -y && \ + dnf install -y which curl git gnupg2 tar net-tools procps-ng python39 python39-devel python39-pip zip unzip # Add Dashboards dependencies (mainly for cypress) -RUN yum install -y xorg-x11-server-Xvfb gtk2-devel gtk3-devel libnotify-devel GConf2 nss libXScrnSaver alsa-lib +RUN dnf install -y xorg-x11-server-Xvfb gtk2-devel gtk3-devel libnotify-devel GConf2 nss libXScrnSaver alsa-lib # Add Yarn dependencies -RUN yum groupinstall -y "Development Tools" && yum install -y cmake && yum clean all && rm -rf /var/cache/yum/* +RUN dnf groupinstall -y "Development Tools" && dnf install -y cmake && dnf clean all && rm -rf /var/cache/dnf/* # Create user group RUN groupadd -g 1000 $CONTAINER_USER && \ @@ -109,16 +109,16 @@ ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH RUN source $NVM_DIR/nvm.sh && ls -al $CONTAINER_USER_HOME && echo $NODE_VERSION $NVM_DIR && nvm use $NODE_VERSION # Add Python dependencies -RUN yum install -y @development zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel openssl-devel xz xz-devel libffi-devel findutils +RUN dnf install -y @development zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel openssl-devel xz xz-devel libffi-devel findutils # Add Dashboards dependencies (mainly for cypress) -RUN yum install -y xorg-x11-server-Xvfb gtk2-devel gtk3-devel libnotify-devel GConf2 nss libXScrnSaver alsa-lib +RUN dnf install -y xorg-x11-server-Xvfb gtk2-devel gtk3-devel libnotify-devel GConf2 nss libXScrnSaver alsa-lib # Add Reports dependencies -RUN yum 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 +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 # Add Yarn dependencies -RUN yum groupinstall -y "Development Tools" && yum clean all && rm -rf /var/cache/yum/* +RUN dnf groupinstall -y "Development Tools" && dnf clean all && rm -rf /var/cache/dnf/* # Setup Shared Memory RUN chmod -R 777 /dev/shm @@ -129,12 +129,12 @@ RUN update-alternatives --set python /usr/bin/python3.9 && \ pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.32.17 # Add other dependencies -RUN yum install -y epel-release && yum clean all && yum install -y jq && yum clean all && rm -rf /var/cache/yum/* && \ +RUN dnf install -y epel-release && dnf clean all && dnf install -y jq && dnf clean all && rm -rf /var/cache/dnf/* && \ pip3 install cmake==3.23.3 # Tools setup COPY --chown=0:0 config/yq-setup.sh config/gh-setup.sh /tmp/ -RUN /tmp/yq-setup.sh && /tmp/gh-setup.sh +RUN dnf install -y go && /tmp/yq-setup.sh && /tmp/gh-setup.sh # Change User USER $CONTAINER_USER diff --git a/docker/ci/dockerfiles/current/test.rockylinux8.systemd-base.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/test.rockylinux8.systemd-base.x64.arm64.dockerfile index 151d8da9d2..8160b8acf0 100644 --- a/docker/ci/dockerfiles/current/test.rockylinux8.systemd-base.x64.arm64.dockerfile +++ b/docker/ci/dockerfiles/current/test.rockylinux8.systemd-base.x64.arm64.dockerfile @@ -139,7 +139,7 @@ RUN dnf groupinstall -y "Development Tools" && dnf clean all # Tools setup COPY --chown=0:0 config/jdk-setup.sh config/yq-setup.sh config/gh-setup.sh /tmp/ -RUN /tmp/jdk-setup.sh && dnf remove -y "java-1.8.0*" && /tmp/yq-setup.sh && /tmp/gh-setup.sh +RUN /tmp/jdk-setup.sh && dnf remove -y "java-1.8.0*" && dnf install -y go && /tmp/yq-setup.sh && /tmp/gh-setup.sh # Setup Shared Memory RUN chmod -R 777 /dev/shm diff --git a/docker/ci/dockerfiles/current/test.ubuntu2004.systemd-base.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/test.ubuntu2004.systemd-base.x64.arm64.dockerfile index 3a8227f086..aff4ab68ad 100644 --- a/docker/ci/dockerfiles/current/test.ubuntu2004.systemd-base.x64.arm64.dockerfile +++ b/docker/ci/dockerfiles/current/test.ubuntu2004.systemd-base.x64.arm64.dockerfile @@ -96,8 +96,8 @@ USER 0 ARG DEBIAN_FRONTEND=noninteractive -# Install python dependencies and chromium dependencies -RUN apt-get update -y && apt-get install -y software-properties-common && add-apt-repository ppa:saiarcot895/chromium-beta -y +# Install python dependencies +RUN apt-get update -y && apt-get install -y software-properties-common && add-apt-repository ppa:longsleep/golang-backports -y # Install python binaries RUN apt-get update -y && apt-get install python3 && \ @@ -145,7 +145,7 @@ RUN source $NVM_DIR/nvm.sh && ls -al $CONTAINER_USER_HOME && echo $NODE_VERSION # Tools setup COPY --chown=0:0 config/jdk-setup.sh config/yq-setup.sh config/gh-setup.sh /tmp/ -RUN /tmp/jdk-setup.sh && /tmp/yq-setup.sh && /tmp/gh-setup.sh +RUN apt-get install -y golang-go && /tmp/jdk-setup.sh && /tmp/yq-setup.sh && /tmp/gh-setup.sh # Setup Shared Memory RUN chmod -R 777 /dev/shm