From f5b200fb1e1c724e261419ba856dc1a25390040c Mon Sep 17 00:00:00 2001
From: Jason Kincl <jkincl@redhat.com>
Date: Mon, 30 Oct 2023 08:56:49 -0400
Subject: [PATCH] Move Slurm image names

---
 .github/workflows/build-images.yml | 10 +++++-----
 README.md                          |  9 +++++++++
 slurm/images/login/Dockerfile      |  2 +-
 slurm/images/munge/Dockerfile      |  2 ++
 slurm/images/slurm/Dockerfile      |  4 ++--
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
index 76504cc..d9fa78c 100644
--- a/.github/workflows/build-images.yml
+++ b/.github/workflows/build-images.yml
@@ -20,15 +20,15 @@ jobs:
 
     - name: Build image - munge
       run: |
-        docker build --build-arg MUNGE_VERSION=0.5.15 slurm/images/munge --tag ghcr.io/${{ github.repository }}:munge-latest
-        docker push ghcr.io/${{ github.repository }}:munge-latest
+        docker build --build-arg MUNGE_VERSION=0.5.15 slurm/images/munge --tag ghcr.io/${{ github.repository }}/munge:latest
+        docker push ghcr.io/${{ github.repository }}/munge:latest
 
     - name: Build image - slurm
       run: |
-        docker build --build-arg SLURM_VERSION=23.02.4 slurm/images/slurm --tag ghcr.io/${{ github.repository }}:slurm-latest
-        docker push ghcr.io/${{ github.repository }}:slurm-latest
+        docker build --build-arg SLURM_VERSION=23.02.4 slurm/images/slurm --tag ghcr.io/${{ github.repository }}/slurm:latest
+        docker push ghcr.io/${{ github.repository }}/slurm:latest
 
     - name: Build image - login
       run: |
         docker build slurm/images/login --tag ghcr.io/${{ github.repository }}:login-latest
-        docker push ghcr.io/${{ github.repository }}:login-latest
\ No newline at end of file
+        docker push ghcr.io/${{ github.repository }}/login:latest
diff --git a/README.md b/README.md
index 91503b2..d12ce5d 100644
--- a/README.md
+++ b/README.md
@@ -9,3 +9,12 @@ Just create a simple NFS server for shared storage this uses the upstream: https
 ```
 $ oc apply -k simple-nfs/
 ```
+
+## Todo
+
+- AWS FSx Lustre support in demo
+- Look at more batch projects in the ecosystem
+- Implement UID/GID enforcement per namespace
+- More advanced view of how jobs are scheduled and placed on the cluster
+- Add and schedule workloads to specialized hardware like GPU or IB
+
diff --git a/slurm/images/login/Dockerfile b/slurm/images/login/Dockerfile
index e1e856b..125ba46 100644
--- a/slurm/images/login/Dockerfile
+++ b/slurm/images/login/Dockerfile
@@ -1,6 +1,6 @@
 FROM quay.io/containerssh/agent AS agent
 
-FROM ghcr.io/naps-product-sa/openshift-batch:slurm-latest
+FROM ghcr.io/naps-product-sa/openshift-batch/slurm:latest
 
 COPY --from=agent /usr/bin/containerssh-agent /usr/bin/containerssh-agent
 
diff --git a/slurm/images/munge/Dockerfile b/slurm/images/munge/Dockerfile
index 69de25b..971c620 100644
--- a/slurm/images/munge/Dockerfile
+++ b/slurm/images/munge/Dockerfile
@@ -1,6 +1,8 @@
 FROM quay.io/centos/centos:stream9 as build
 ARG MUNGE_VERSION=0.5.15
 
+LABEL org.opencontainers.image.source="https://github.com/naps-product-sa/openshift-batch"
+
 RUN dnf install -y xz gcc openssl-devel bzip2-devel zlib-devel procps-ng
 
 RUN mkdir /tmp/src
diff --git a/slurm/images/slurm/Dockerfile b/slurm/images/slurm/Dockerfile
index 8abde20..64d697d 100644
--- a/slurm/images/slurm/Dockerfile
+++ b/slurm/images/slurm/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/naps-product-sa/openshift-batch:munge-latest as build
+FROM ghcr.io/naps-product-sa/openshift-batch/munge:latest as build
 ARG SLURM_VERSION=23.02.4
 
 RUN dnf install --enablerepo=crb -y xz gcc procps-ng bzip2 perl git autoconf automake libtool diffutils jansson \
@@ -39,7 +39,7 @@ COPY --from=build /usr/bin/s* /usr/bin/
 COPY --from=build /usr/sbin/slurm* /usr/sbin/
 COPY --from=build /usr/share/man/ /usr/share/man/
 
-FROM ghcr.io/naps-product-sa/openshift-batch:munge-latest
+FROM ghcr.io/naps-product-sa/openshift-batch/munge:latest
 
 COPY --from=tmp / /