From 62a294bc80d7b11f239e4a59cd9195b15e6887a0 Mon Sep 17 00:00:00 2001
From: Manu Bretelle <chantr4@gmail.com>
Date: Fri, 23 Aug 2024 10:59:09 -0700
Subject: [PATCH] add more tools

---
 s390x-native.Dockerfile | 60 +++++++++++++++++++++++------------------
 1 file changed, 34 insertions(+), 26 deletions(-)

diff --git a/s390x-native.Dockerfile b/s390x-native.Dockerfile
index 639b315..18da793 100644
--- a/s390x-native.Dockerfile
+++ b/s390x-native.Dockerfile
@@ -5,6 +5,15 @@ FROM s390x/ubuntu:${UBUNTU_VERSION}
 # Redefining UBUNTU_VERSION without a value inherits the global default
 ARG UBUNTU_VERSION
 
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get -y install \
+    git \
+    jq \
+    sudo \
+    tree \
+    wget && \
+    apt-get clean
+
 RUN apt-get update \
   && apt-get install -y cmake flex bison build-essential libssl-dev ncurses-dev xz-utils bc rsync libguestfs-tools qemu-kvm qemu-utils linux-image-generic zstd binutils-dev elfutils libcap-dev libelf-dev libdw-dev python3-docutils \
   && apt-get install -y g++ libelf-dev \
@@ -13,56 +22,55 @@ RUN apt-get update \
   && echo "deb https://apt.llvm.org/${UBUNTU_VERSION}/ llvm-toolchain-${UBUNTU_VERSION} main" > /etc/apt/sources.list.d/llvm.list \
   && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
   && apt-get update \
-  && apt-get install -y clang lld llvm
+  && apt-get install -y clang lld llvm \
+  && apt-get clean
+
+# Create Github Actions Runner user.
+ARG HOMEDIR=/actions-runner
+WORKDIR ${HOMEDIR}
+RUN useradd -d ${HOMEDIR} -m runner
+RUN echo "runner ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+RUN echo "Defaults env_keep += \"DEBIAN_FRONTEND\"" >>/etc/sudoers
+# Make sure kvm group exists. This is a no-op when it does.
+RUN addgroup --system kvm
+RUN usermod -a -G kvm runner
+RUN chown -R runner:runner  ${HOMEDIR}
+
 
 ## s390x runner native install taken from https://github.com/anup-kodlekere/gaplib
-ARG VERSION=2.317.0
+ARG VERSION=2.319.1
 ARG SDK=6
 ARG  RUNNERREPO="https://github.com/actions/runner"
 RUN apt-get update \
-  && apt-get install -y alien
+  && apt-get install -y alien \
+  && apt-get clean
 
 # copy scripts/patch from anup-kodlekere/gaplib
 RUN curl -L https://raw.githubusercontent.com/anup-kodlekere/gaplib/main/build-files/convert-rpm.sh -o /tmp/convert-rpm.sh && chmod 755 /tmp/convert-rpm.sh
 RUN curl -L https://raw.githubusercontent.com/anup-kodlekere/gaplib/main/build-files/runner-s390x.patch -o /tmp/runner.patch
 
-RUN /tmp/convert-rpm.sh ${SDK}
-
-RUN dpkg --install /tmp/*.deb && \
-  rm -rf /tmp/*.deb && \
+RUN /tmp/convert-rpm.sh ${SDK} && \
+  dpkg --install /tmp/*.deb && \
+  rm -rf /tmp/*.{rpm,deb} && \
   echo "Using SDK - `dotnet --version`"
 
-
 RUN cd /tmp && \
   git clone -q ${RUNNERREPO} && \
   cd runner && \
   git checkout v${VERSION} -b build && \
   sed -i'' -e /version/s/6......\"$/${SDK}.0.100\"/ src/global.json && \
-  git apply /tmp/runner.patch
-
-RUN cd /tmp/runner/src && \
+  git apply /tmp/runner.patch && \
+  cd src && \
   ./dev.sh layout && \
   ./dev.sh package && \
   ./dev.sh test && \
-  rm -rf /root/.dotnet /root/.nuget
-
+  rm -rf /root/.dotnet /root/.nuget && \
+  sudo -u runner tar -C ${HOMEDIR} -xzf /tmp/runner/_package/actions-runner-linux-s390x-${VERSION}.tar.gz && \
+  rm -rf /tmp/runner
 
-# amd64 Github Actions Runner.
-ARG HOMEDIR=/actions-runner
 # Copy scripts from  myoung34/docker-github-actions-runner
 RUN curl -L https://raw.githubusercontent.com/myoung34/docker-github-actions-runner/${VERSION}/entrypoint.sh -o /entrypoint.sh && chmod 755 /entrypoint.sh
 RUN curl -L https://raw.githubusercontent.com/myoung34/docker-github-actions-runner/${VERSION}/token.sh -o /token.sh && chmod 755 /token.sh
 
-RUN useradd -d ${HOMEDIR} -m runner
-RUN echo "runner ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
-RUN echo "Defaults env_keep += \"DEBIAN_FRONTEND\"" >>/etc/sudoers
-# Make sure kvm group exists. This is a no-op when it does.
-RUN addgroup --system kvm
-RUN usermod -a -G kvm runner
-USER runner
-ENV USER=runner
-WORKDIR ${HOMEDIR}
-USER root
-
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["./bin/Runner.Listener", "run", "--startuptype", "service"]