Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/build-matrices.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Flux View Build Matrices

on:
workflow_dispatch:
pull_request: []
pull_request: {}
push:
branches:
- main
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ It works as follows:
4. We move the entire thing to a shared empty volume with the other application container
5. The application container entrypoitn is edited to get wrapped with Flux

We will see if it works!
We will see if it works!
22 changes: 9 additions & 13 deletions rocky/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,35 +1,31 @@
ARG tag=8
ARG tag=9
FROM spack/rockylinux${tag}:latest AS builder
ARG ARCH=x86_64
ENV ARCH=${ARCH}

# docker buildx build --network host --platform linux/amd64,linux/arm64 -t ghcr.io/converged-computing/flux-view-rocky:tag-9-2025 --push .

# rocky 9 doesn't easily install texlive, which has a makeinfo
RUN dnf update -y && dnf install -y gettext wget && \
yum install dnf-plugins-core || true && \
dnf config-manager --enable crb || true && \
dnf install -y texlive bison make
dnf install -y texlive bison make python3 python3-devel

# Specify flux deps in the spack manifest file (spack.yaml)
RUN mkdir /opt/spack-environment \
&& (echo spack: \
&& echo ' specs: [flux-sched, flux-core, pmix@4.2.2, flux-pmix, libzmq]' \
&& echo ' specs: [flux-sched, flux-core, pmix, flux-pmix, libzmq]' \
&& echo ' view: /opt/views/view' \
&& echo ' concretizer:' \
&& echo ' unify: true' \
&& echo ' packages:' \
&& echo ' all:' \
&& echo ' require: ["target=:${ARCH}"]' \
&& echo ' config:' \
&& echo ' install_tree: /opt/software') > /opt/spack-environment/spack-template.yaml

RUN envsubst < /opt/spack-environment/spack-template.yaml > /opt/spack-environment/spack.yaml && \
cat /opt/spack-environment/spack.yaml
&& echo ' install_tree:' \
&& echo ' root: /opt/software') > /opt/spack-environment/spack.yaml

# Install the software, remove unnecessary deps
RUN cd /opt/spack-environment && \
. /opt/spack/share/spack/setup-env.sh && \
spack env activate . && \
spack external find bison && \
spack external find python && \
spack install --fail-fast && spack gc -y

# Strip all the binaries
Expand All @@ -46,7 +42,7 @@ RUN cd /opt/spack-environment && \
python3 -m ensurepip

# Bare OS image to run the installed executables
ARG tag=8
ARG tag=9
FROM rockylinux:${tag}

COPY --from=builder /opt/spack-environment /opt/spack-environment
Expand Down
5 changes: 3 additions & 2 deletions ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,16 @@ RUN apt-get update && apt-get install -y gettext-base
# is specified in a manifest file (spack.yaml)
RUN mkdir /opt/spack-environment \
&& (echo spack: \
&& echo ' specs: [flux-sched, flux-core, pmix@4.2.2, flux-pmix@0.4.0, libzmq@4.3.4]' \
&& echo ' specs: [flux-sched, flux-core@master, pmix, flux-pmix, libzmq]' \
&& echo ' view: /opt/views/view' \
&& echo ' concretizer:' \
&& echo ' unify: true' \
&& echo ' packages:' \
&& echo ' all:' \
&& echo ' require: ["target=:${ARCH}"]' \
&& echo ' config:' \
&& echo ' install_tree: /opt/software') > /opt/spack-environment/spack-template.yaml
&& echo ' install_tree:' \
&& echo ' root: /opt/software') > /opt/spack-environment/spack-template.yaml

RUN envsubst < /opt/spack-environment/spack-template.yaml > /opt/spack-environment/spack.yaml && \
cat /opt/spack-environment/spack.yaml
Expand Down
4 changes: 1 addition & 3 deletions ubuntu/uptodate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ dockerbuild:
build_args:
tag:
key: "tag"
# jammy and focal won't build with flux-sched requiring gcc>12
versions:
- "focal"
- "jammy"
- "bionic"
- "noble"