docker: update image bases

Problem: older bases do not have new enough gcc to build flux-sched. Signed-off-by: vsoch <[email protected]>
flux-framework · Feb 8, 2025 · fc7a62d · fc7a62d
1 parent 776aac8
commit fc7a62d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -21,10 +21,10 @@ jobs:
       fail-fast: false
       matrix:
         # container base and lib prefix
-        test: [["fluxrm/flux-sched:jammy", "/usr/lib"],
+        test: [["fluxrm/flux-sched:noble", "/usr/lib"],
                ["fluxrm/flux-sched:fedora40", "/usr/lib64"],
                ["fluxrm/flux-sched:bookworm-amd64", "/usr/lib"],
-               ["fluxrm/flux-sched:el8", "/usr/lib64"]]
+               ["fluxrm/flux-sched:el9", "/usr/lib64"]]
 
     container:
       image: ${{ matrix.test[0] }}

diff --git a/Dockerfile b/Dockerfile
@@ -14,6 +14,9 @@ RUN wget https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz  && tar -xvf go${G
 ENV PATH=$PATH:/usr/local/go/bin:/home/vscode/go/bin
 
 RUN git clone -b grow-api https://github.com/milroy/flux-sched /opt/flux-sched
+COPY .devcontainer/update.patch /opt/flux-sched/update.patch
+RUN cd /opt/flux-sched && \
+    mkdir build && cd build && cmake ../ && make -j && sudo make install
 
 # Assuming installing to /usr/local
 ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib/flux:/usr/local/lib