Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ENV format in gasnet{-smp} Dockerfiles #26723

Merged
merged 2 commits into from
Feb 25, 2025
Merged

Fix ENV format in gasnet{-smp} Dockerfiles #26723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2c6a4b
Fix ENV format in gasnet{-smp} Dockerfiles
arifthpe Feb 18, 2025
16d4a4f
Fix more ENVs somehow missed
arifthpe Feb 18, 2025
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
8 changes: 4 additions & 4 deletions util/packaging/docker/gasnet-smp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM chapel/chapel:latest

ENV CHPL_COMM gasnet
ENV CHPL_COMM_SUBSTRATE smp
ENV CHPL_RT_OVERSUBSCRIBED yes
ENV CHPL_COMM=gasnet
ENV CHPL_COMM_SUBSTRATE=smp
ENV CHPL_RT_OVERSUBSCRIBED=yes

# By default GASNet will use POSIX shared memory, whose memory allocations
# reside in /dev/shm. The default /dev/shm size for docker is only 64MB, which
# is far too small for us, so use the SystemV implementation instead.
ENV CHPL_GASNET_MORE_CFG_OPTIONS "--disable-pshm-posix --enable-pshm-sysv"
ENV CHPL_GASNET_MORE_CFG_OPTIONS="--disable-pshm-posix --enable-pshm-sysv"

RUN CHPL_TARGET_COMPILER=llvm make -C $CHPL_HOME \
&& CHPL_TARGET_COMPILER=gnu make -C $CHPL_HOME \
Expand Down
6 changes: 3 additions & 3 deletions util/packaging/docker/gasnet/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM chapel/chapel:latest

ENV CHPL_COMM gasnet
ENV CHPL_RT_OVERSUBSCRIBED yes
ENV CHPL_COMM=gasnet
ENV CHPL_RT_OVERSUBSCRIBED=yes

RUN CHPL_TARGET_COMPILER=llvm make -C $CHPL_HOME \
&& CHPL_TARGET_COMPILER=gnu make -C $CHPL_HOME \
&& make -C $CHPL_HOME chpldoc test-venv mason \
&& make -C $CHPL_HOME cleanall

ENV GASNET_SPAWNFN L
ENV GASNET_SPAWNFN=L