Skip to content

Commit f04ee7d

Browse files
Build dependencies instead of apt-installing
1 parent 45ddc7c commit f04ee7d

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

.github/docker-compose.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ services:
99
ENV OMPI_VERSION=$${OMPI_VERSION}
1010
CMD cp /configs/spack.yaml . && \
1111
spack -e . add openmpi@$${OMPI_VERSION} && \
12-
spack -e . containerize >/configs/spack.Dockerfile && \
13-
sed -i -e 's/spack install/spack external find --all \&\& spack -d install/;' /configs/spack.Dockerfile
12+
spack -e . containerize >/configs/spack.Dockerfile
1413
args:
1514
OMPI_VERSION: main
1615
no_cache: true
@@ -19,7 +18,7 @@ services:
1918
- .github/:/configs
2019

2120
env:
22-
image: "ghcr.io/sandialabs/fenix/env"
21+
image: "ghcr.io/sandialabs/fenix/env:main"
2322
build:
2423
# Generated by running the bootstrap image
2524
dockerfile: .github/spack.Dockerfile
@@ -28,7 +27,7 @@ services:
2827
image: "fenix"
2928
build:
3029
dockerfile_inline: |
31-
ARG OMPI_VERSION
30+
ARG OMPI_VERSION main
3231
FROM ghcr.io/sandialabs/fenix/env:$${OMPI_VERSION}
3332
COPY . /fenix
3433
RUN . /opt/spack-environment/activate.sh && \

.github/spack.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,15 @@ spack:
1616
build:
1717
- build-essential
1818
- autotools-dev
19-
- libevent-dev
2019
- pkg-config
2120
- python3
2221
- m4
2322
- autoconf
2423
- automake
25-
- libtool
2624
- flex
2725
- git
2826
- zlib1g-dev
29-
- openssh-server
30-
- openssl
3127
- libperl-dev
32-
- pkg-config
3328
- numactl
3429
final:
3530
- build-essential

0 commit comments

Comments
 (0)