From ad037de2e01fc9f71ab268d61335093293c3acf3 Mon Sep 17 00:00:00 2001 From: Christopher Harrop Date: Fri, 1 Nov 2024 09:19:58 -0600 Subject: [PATCH 1/3] Remove unnecessary Slurm packages and cleanup /tmp after install --- frontend/Dockerfile | 19 ++++++------------- master/Dockerfile | 19 ++++++------------- node/Dockerfile | 19 ++++++------------- 3 files changed, 18 insertions(+), 39 deletions(-) diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 56fb0f9..d23e278 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,15 +1,13 @@ FROM ubuntu:22.04 +ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update -y && apt-get install -y \ build-essential \ git \ mariadb-server \ munge \ vim \ - wget - -ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get install -y \ + wget \ devscripts \ equivs \ fakeroot \ @@ -17,9 +15,8 @@ RUN apt-get install -y \ libdbus-1-dev \ libhwloc-dev \ openssh-server \ - sudo - -RUN cd /tmp \ + sudo \ + && cd /tmp \ && wget https://download.schedmd.com/slurm/slurm-23.11.7.tar.bz2 \ && tar -xaf slurm-23.11.7.tar.bz2 \ && cd slurm-23.11.7 \ @@ -30,14 +27,10 @@ RUN cd /tmp \ && dpkg --install slurm-smd_23.11.7-1_${ARCH}.deb \ && dpkg --install slurm-smd-client_23.11.7-1_${ARCH}.deb \ && dpkg --install slurm-smd-dev_23.11.7-1_${ARCH}.deb \ - && dpkg --install slurm-smd-doc_23.11.7-1_all.deb \ - && dpkg --install slurm-smd-libnss-slurm_23.11.7-1_${ARCH}.deb \ - && dpkg --install slurm-smd-libpam-slurm-adopt_23.11.7-1_${ARCH}.deb \ && dpkg --install slurm-smd-libpmi0_23.11.7-1_${ARCH}.deb \ && dpkg --install slurm-smd-libpmi2-0_23.11.7-1_${ARCH}.deb \ - && dpkg --install slurm-smd-libslurm-perl_23.11.7-1_${ARCH}.deb \ - && dpkg --install slurm-smd-sackd_23.11.7-1_${ARCH}.deb \ - && dpkg --install slurm-smd-sview_23.11.7-1_${ARCH}.deb + && rm -rf /tmp/slurm* \ + && rm -rf /var/lib/apt/lists/* RUN useradd -m admin -s /usr/bin/bash -d /home/admin \ && echo "admin:admin" | chpasswd \ diff --git a/master/Dockerfile b/master/Dockerfile index 4d3c8c7..02701f8 100644 --- a/master/Dockerfile +++ b/master/Dockerfile @@ -1,15 +1,13 @@ FROM ubuntu:22.04 +ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update -y && apt-get install -y \ build-essential \ git \ mariadb-server \ munge \ vim \ - wget - -ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get install -y \ + wget \ devscripts \ equivs \ fakeroot \ @@ -17,9 +15,8 @@ RUN apt-get install -y \ libdbus-1-dev \ libhwloc-dev \ openssh-server \ - sudo - -RUN cd /tmp \ + sudo \ + && cd /tmp \ && wget https://download.schedmd.com/slurm/slurm-23.11.7.tar.bz2 \ && tar -xaf slurm-23.11.7.tar.bz2 \ && cd slurm-23.11.7 \ @@ -31,14 +28,10 @@ RUN cd /tmp \ && dpkg --install slurm-smd-client_23.11.7-1_${ARCH}.deb \ && dpkg --install slurm-smd-slurmctld_23.11.7-1_${ARCH}.deb \ && dpkg --install slurm-smd-dev_23.11.7-1_${ARCH}.deb \ - && dpkg --install slurm-smd-doc_23.11.7-1_all.deb \ - && dpkg --install slurm-smd-libnss-slurm_23.11.7-1_${ARCH}.deb \ - && dpkg --install slurm-smd-libpam-slurm-adopt_23.11.7-1_${ARCH}.deb \ && dpkg --install slurm-smd-libpmi0_23.11.7-1_${ARCH}.deb \ && dpkg --install slurm-smd-libpmi2-0_23.11.7-1_${ARCH}.deb \ - && dpkg --install slurm-smd-libslurm-perl_23.11.7-1_${ARCH}.deb \ - && dpkg --install slurm-smd-sackd_23.11.7-1_${ARCH}.deb \ - && dpkg --install slurm-smd-sview_23.11.7-1_${ARCH}.deb + && rm -rf /tmp/slurm* \ + && rm -rf /var/lib/apt/lists/* RUN useradd -m admin -s /usr/bin/bash -d /home/admin \ && echo "admin:admin" | chpasswd \ diff --git a/node/Dockerfile b/node/Dockerfile index 544183d..8251fc4 100644 --- a/node/Dockerfile +++ b/node/Dockerfile @@ -1,15 +1,13 @@ FROM ubuntu:22.04 +ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update -y && apt-get install -y \ build-essential \ git \ mariadb-server \ munge \ vim \ - wget - -ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get install -y \ + wget \ devscripts \ equivs \ fakeroot \ @@ -17,9 +15,8 @@ RUN apt-get install -y \ libdbus-1-dev \ libhwloc-dev \ openssh-server \ - sudo - -RUN cd /tmp \ + sudo \ + && cd /tmp \ && wget https://download.schedmd.com/slurm/slurm-23.11.7.tar.bz2 \ && tar -xaf slurm-23.11.7.tar.bz2 \ && cd slurm-23.11.7 \ @@ -31,14 +28,10 @@ RUN cd /tmp \ && dpkg --install slurm-smd-client_23.11.7-1_${ARCH}.deb \ && dpkg --install slurm-smd-slurmd_23.11.7-1_${ARCH}.deb \ && dpkg --install slurm-smd-dev_23.11.7-1_${ARCH}.deb \ - && dpkg --install slurm-smd-doc_23.11.7-1_all.deb \ - && dpkg --install slurm-smd-libnss-slurm_23.11.7-1_${ARCH}.deb \ - && dpkg --install slurm-smd-libpam-slurm-adopt_23.11.7-1_${ARCH}.deb \ && dpkg --install slurm-smd-libpmi0_23.11.7-1_${ARCH}.deb \ && dpkg --install slurm-smd-libpmi2-0_23.11.7-1_${ARCH}.deb \ - && dpkg --install slurm-smd-libslurm-perl_23.11.7-1_${ARCH}.deb \ - && dpkg --install slurm-smd-sackd_23.11.7-1_${ARCH}.deb \ - && dpkg --install slurm-smd-sview_23.11.7-1_${ARCH}.deb + && rm -rf /tmp/slurm* \ + && rm -rf /var/lib/apt/lists/* RUN useradd -m admin -s /usr/bin/bash -d /home/admin \ && echo "admin:admin" | chpasswd \ From 73f773525ff60eeb3c58d723f8f03592cbe1ad64 Mon Sep 17 00:00:00 2001 From: Christopher Harrop Date: Fri, 1 Nov 2024 09:27:01 -0600 Subject: [PATCH 2/3] Update CI workflow to use new version of docker compose and newer Ubuntu runner --- .github/workflows/docker.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c5ea8bf..f756ca6 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -16,7 +16,7 @@ jobs: docker_compose_test: name: Docker Compose Test - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - @@ -24,15 +24,15 @@ jobs: uses: actions/checkout@v4 - name: Build and start containers - run: docker-compose -f docker-compose.yml up --build -d + run: docker compose -f docker-compose.yml up --build -d - name: Check cluster logs - run: docker-compose -f docker-compose.yml logs + run: docker compose -f docker-compose.yml logs - name: Check status of the cluster containers - run: docker-compose -f docker-compose.yml ps + run: docker compose -f docker-compose.yml ps - name: Check status of Slurm @@ -51,7 +51,7 @@ jobs: - name: Shut down Slurm cluster containers - run: docker-compose -f docker-compose.yml down + run: docker compose -f docker-compose.yml down build-frontend-arm64: runs-on: LinuxARM64-4core-16G-150Gb From 698ea40face7f4359e9c9830c315573b54555b85 Mon Sep 17 00:00:00 2001 From: Christopher Harrop Date: Fri, 1 Nov 2024 09:50:27 -0600 Subject: [PATCH 3/3] Try to fix docker compose problem by using a more powerful runner --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index f756ca6..47a6ff9 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -16,7 +16,7 @@ jobs: docker_compose_test: name: Docker Compose Test - runs-on: ubuntu-latest + runs-on: ubuntu2204-4c-16g-150ssd steps: -