Skip to content

Commit a719be4

Browse files
Merge pull request #9348 from awallace-cray/work
Update Dockerfiles from 1.17.0 to 1.17.1 (cp PR #9347) [release 1.17.1]
2 parents 099bd13 + 08fc89a commit a719be4

File tree

5 files changed

+47
-2
lines changed

5 files changed

+47
-2
lines changed

util/dockerfiles/1.17.0/Dockerfile

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
FROM debian:stretch
2+
3+
RUN apt-get update && apt-get install -y --no-install-recommends \
4+
wget \
5+
ca-certificates \
6+
gcc \
7+
g++ \
8+
perl \
9+
python \
10+
python-dev \
11+
python-setuptools \
12+
libgmp10 \
13+
libgmp-dev \
14+
bash \
15+
make \
16+
mawk \
17+
file \
18+
pkg-config \
19+
&& rm -rf /var/lib/apt/lists/*
20+
21+
ENV CHPL_VERSION 1.17.0
22+
ENV CHPL_HOME /opt/chapel/$CHPL_VERSION
23+
ENV CHPL_GMP system
24+
25+
RUN mkdir -p /opt/chapel \
26+
&& wget -q -O - https://github.com/chapel-lang/chapel/releases/download/$CHPL_VERSION/chapel-$CHPL_VERSION.tar.gz | tar -xzC /opt/chapel --transform 's/chapel-//' \
27+
&& make -C $CHPL_HOME \
28+
&& make -C $CHPL_HOME chpldoc \
29+
&& make -C $CHPL_HOME test-venv
30+
31+
ENV PATH $PATH:$CHPL_HOME/bin/linux64:$CHPL_HOME/util
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
FROM chapel/chapel:latest
2+
3+
ENV CHPL_COMM gasnet
4+
5+
RUN make -C $CHPL_HOME \
6+
&& make -C $CHPL_HOME chpldoc \
7+
&& make -C $CHPL_HOME test-venv
8+
9+
ENV GASNET_SPAWNFN L

util/dockerfiles/Dockerfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ FROM debian:stretch
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
wget \
5+
curl \
56
ca-certificates \
67
gcc \
78
g++ \
@@ -26,6 +27,7 @@ RUN mkdir -p /opt/chapel \
2627
&& wget -q -O - https://github.com/chapel-lang/chapel/releases/download/$CHPL_VERSION/chapel-$CHPL_VERSION.tar.gz | tar -xzC /opt/chapel --transform 's/chapel-//' \
2728
&& make -C $CHPL_HOME \
2829
&& make -C $CHPL_HOME chpldoc \
29-
&& make -C $CHPL_HOME test-venv
30+
&& make -C $CHPL_HOME test-venv \
31+
&& make -C $CHPL_HOME cleanall
3032

3133
ENV PATH $PATH:$CHPL_HOME/bin/linux64:$CHPL_HOME/util

util/dockerfiles/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
## `chapel/chapel:<version>`
1313
Supported Chapel versions:
1414
* [`1.17.1`, `latest` (_1.17.1/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.17/util/dockerfiles/Dockerfile/)
15+
* [`1.17.0` (_1.17.0/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.17/util/dockerfiles/1.17.0/Dockerfile/)
1516
* [`1.16.0` (_1.16.0/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/master/util/dockerfiles/1.16.0/Dockerfile/)
1617
* [`1.15.0` (_1.15.0/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/master/util/dockerfiles/1.15.0/Dockerfile/)
1718

@@ -20,6 +21,7 @@ This is the core image for Chapel. It provides the complete Chapel compiler and
2021
## [`chapel/chapel-gasnet:<version>`](https://hub.docker.com/r/chapel/chapel-gasnet/)
2122

2223
* [`1.17.1`, `latest` (_1.17.1/gasnet/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.17/util/dockerfiles/gasnet/Dockerfile/)
24+
* [`1.17.0` (_1.17.0/gasnet/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.17/util/dockerfiles/1.17.0/gasnet/Dockerfile/)
2325
* [`1.16.0` (_1.16.0/gasnet/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/master/util/dockerfiles/1.16.0/gasnet/Dockerfile/)
2426
* [`1.15.0` (_1.15.0/gasnet/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/master/util/dockerfiles/1.15.0/gasnet/Dockerfile/)
2527

util/dockerfiles/gasnet/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ ENV CHPL_COMM gasnet
44

55
RUN make -C $CHPL_HOME \
66
&& make -C $CHPL_HOME chpldoc \
7-
&& make -C $CHPL_HOME test-venv
7+
&& make -C $CHPL_HOME test-venv \
8+
&& make -C $CHPL_HOME cleanall
89

910
ENV GASNET_SPAWNFN L

0 commit comments

Comments
 (0)