Skip to content

Commit

Permalink
Remove unnecessary Slurm packages and cleanup /tmp after install (#10)
Browse files Browse the repository at this point in the history
* Remove unnecessary Slurm packages and cleanup /tmp after install

* Update CI workflow to use new version of docker compose and newer Ubuntu runner

* Try to fix docker compose problem by using a more powerful runner
christopherwharrop-noaa authored Nov 1, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 5e0ceee commit 7634b99
Showing 4 changed files with 23 additions and 44 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -16,23 +16,23 @@ jobs:

docker_compose_test:
name: Docker Compose Test
runs-on: ubuntu-20.04
runs-on: ubuntu2204-4c-16g-150ssd

steps:
-
name: Checkout Repository
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
19 changes: 6 additions & 13 deletions frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
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 \
libbpf-dev \
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 \
19 changes: 6 additions & 13 deletions master/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
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 \
libbpf-dev \
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 \
19 changes: 6 additions & 13 deletions node/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
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 \
libbpf-dev \
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 \

0 comments on commit 7634b99

Please sign in to comment.