Skip to content

Commit

Permalink
Merge pull request #15513 from soohoonchoi/RAD-1354
Browse files Browse the repository at this point in the history
Update Dockerfile and README for Chapel Release 1.22.0: Release Branch Only
  • Loading branch information
soohoonchoi authored Apr 15, 2020
2 parents c1c1cc8 + e4a8487 commit 57d552f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions util/dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
git \
&& rm -rf /var/lib/apt/lists/*

ENV CHPL_VERSION master
ENV CHPL_VERSION 1.22.0
ENV CHPL_HOME /opt/chapel/$CHPL_VERSION
ENV CHPL_GMP system

RUN mkdir -p /opt/chapel \
&& wget -q -O - https://github.com/chapel-lang/chapel/archive/$CHPL_VERSION.tar.gz | tar -xzC /opt/chapel --transform 's/chapel-//' \
&& 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-//' \
&& make -C $CHPL_HOME \
&& make -C $CHPL_HOME chpldoc test-venv mason \
&& make -C $CHPL_HOME cleanall
Expand Down
10 changes: 5 additions & 5 deletions util/dockerfiles/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@

## `chapel/chapel:<version>`
Supported Chapel versions:
* [`1.20.0`, `latest` (_1.20.0/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.20/util/dockerfiles/Dockerfile/)
* [`1.19.0` (_1.19.0/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.19/util/dockerfiles/1.19.0/Dockerfile/)
* [`1.22.0`, `latest` (_1.22.0/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.22/util/dockerfiles/Dockerfile/)
* [`1.21.0` (_1.21.0/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.21/util/dockerfiles/1.21.0/Dockerfile/)

This is the core image for Chapel. It provides the complete Chapel compiler and runtime. It can be used to compile and run Chapel programs inside the Docker container. On 64-bit Linux hosts, the compiled Chapel program binary can sometimes be executed outside the container (your mileage may vary). Other Chapel-based Docker images can be created from this image.

## [`chapel/chapel-gasnet:<version>`](https://hub.docker.com/r/chapel/chapel-gasnet/)

* [`1.20.0`, `latest` (_1.20.0/gasnet/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.20/util/dockerfiles/gasnet/Dockerfile/)
* [`1.19.0` (_1.19.0/gasnet/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.19/util/dockerfiles/1.19.0/gasnet/Dockerfile/)
* [`1.22.0`, `latest` (_1.22.0/gasnet/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.22/util/dockerfiles/gasnet/Dockerfile/)
* [`1.21.0` (_1.21.0/gasnet/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.21/util/dockerfiles/1.21.0/gasnet/Dockerfile/)

The Chapel core image (above), rebuilt with `CHPL_COMM=gasnet` and `GASNET_SPAWNFN=L`. Simulates a multilocale Chapel platform within the Docker container.

Expand Down Expand Up @@ -66,7 +66,7 @@ Hello, world!
# Documentation

Chapel's documentation is [available online](https://chapel-lang.org/docs/).
Documentation for a specific release is also available: [1.19](https://chapel-lang.org/docs/1.19/).
Documentation for a specific release is also available: [1.21](https://chapel-lang.org/docs/1.21/).

# License

Expand Down

0 comments on commit 57d552f

Please sign in to comment.