Build dependencies instead of apt-installing

sandialabs · Nov 13, 2024 · f04ee7d · f04ee7d
1 parent 45ddc7c
commit f04ee7d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml
@@ -9,8 +9,7 @@ services:
         ENV OMPI_VERSION=$${OMPI_VERSION}
         CMD cp /configs/spack.yaml . && \
             spack -e . add openmpi@$${OMPI_VERSION} && \
-            spack -e . containerize >/configs/spack.Dockerfile && \
-            sed -i -e 's/spack install/spack external find --all \&\& spack -d install/;' /configs/spack.Dockerfile
+            spack -e . containerize >/configs/spack.Dockerfile
       args:
         OMPI_VERSION: main
       no_cache: true
@@ -19,7 +18,7 @@ services:
       - .github/:/configs
 
   env:
-    image: "ghcr.io/sandialabs/fenix/env"
+    image: "ghcr.io/sandialabs/fenix/env:main"
     build:
       # Generated by running the bootstrap image
       dockerfile: .github/spack.Dockerfile
@@ -28,7 +27,7 @@ services:
     image: "fenix"
     build:
       dockerfile_inline: |
-        ARG OMPI_VERSION
+        ARG OMPI_VERSION main
         FROM ghcr.io/sandialabs/fenix/env:$${OMPI_VERSION}
         COPY . /fenix
         RUN . /opt/spack-environment/activate.sh && \

diff --git a/.github/spack.yaml b/.github/spack.yaml
@@ -16,20 +16,15 @@ spack:
       build:
         - build-essential
         - autotools-dev
-        - libevent-dev
         - pkg-config
         - python3
         - m4
         - autoconf
         - automake
-        - libtool
         - flex
         - git
         - zlib1g-dev
-        - openssh-server
-        - openssl
         - libperl-dev
-        - pkg-config
         - numactl
       final:
         - build-essential