Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unnecessary Slurm packages and cleanup /tmp after install #10

Merged
merged 3 commits into from
Nov 1, 2024
Merged

Remove unnecessary Slurm packages and cleanup /tmp after install #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad037de
Remove unnecessary Slurm packages and cleanup /tmp after install
christopherwharrop-noaa Nov 1, 2024
73f7735
Update CI workflow to use new version of docker compose and newer Ubu…
christopherwharrop-noaa Nov 1, 2024
698ea40
Try to fix docker compose problem by using a more powerful runner
christopherwharrop-noaa Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
19 changes: 6 additions & 13 deletions frontend/Dockerfile
View file
Open in desktop
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 \
Expand All @@ -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 \
Expand Down
19 changes: 6 additions & 13 deletions master/Dockerfile
View file
Open in desktop
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 \
Expand All @@ -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 \
Expand Down
19 changes: 6 additions & 13 deletions node/Dockerfile
View file
Open in desktop
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 \
Expand All @@ -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 \
Expand Down