Skip to content

Commit

Permalink
Merge pull request #12630 from soohoonchoi/RAD-956
Browse files Browse the repository at this point in the history
Update Dockerfiles and README for Chapel Release 1.19.0: Release Branch Only
  • Loading branch information
soohoonchoi authored Mar 18, 2019
2 parents 3e46523 + 23ced79 commit d44399d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 15 deletions.
6 changes: 3 additions & 3 deletions util/dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:stretch
FROM debian:9.5

RUN apt-get update && apt-get install -y --no-install-recommends \
wget \
Expand All @@ -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.19.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
18 changes: 7 additions & 11 deletions util/dockerfiles/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,15 @@

## `chapel/chapel:<version>`
Supported Chapel versions:
* [`1.17.1`, `latest` (_1.17.1/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.17/util/dockerfiles/Dockerfile/)
* [`1.17.0` (_1.17.0/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.17/util/dockerfiles/1.17.0/Dockerfile/)
* [`1.16.0` (_1.16.0/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/master/util/dockerfiles/1.16.0/Dockerfile/)
* [`1.15.0` (_1.15.0/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/master/util/dockerfiles/1.15.0/Dockerfile/)
* [`1.19.0`, `latest` (_1.19.0/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.19/util/dockerfiles/Dockerfile/)
* [`1.18.0` (_1.18.0/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.18/util/dockerfiles/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.17.1`, `latest` (_1.17.1/gasnet/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.17/util/dockerfiles/gasnet/Dockerfile/)
* [`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/)
* [`1.16.0` (_1.16.0/gasnet/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/master/util/dockerfiles/1.16.0/gasnet/Dockerfile/)
* [`1.15.0` (_1.15.0/gasnet/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/master/util/dockerfiles/1.15.0/gasnet/Dockerfile/)
* [`1.19.0`, `latest` (_1.19.0/gasnet/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.19/util/dockerfiles/gasnet/Dockerfile/)
* [`1.18.0` (_1.18.0/gasnet/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.18/util/dockerfiles/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 @@ -70,12 +66,12 @@ Hello, world!
# Documentation

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

# License

View [license information](https://chapel-lang.org/license.html) for the software contained in this image.

# User Feedback
# For More Information

If you have any questions about or problems with this image, please write to the [Chapel developers mailing list](https://lists.sourceforge.net/lists/listinfo/chapel-developers). To post a message to all the list members, send email to [[email protected]](mailto:[email protected]). You may also be interested in other [Chapel resources for developers](https://chapel-lang.org/developers.html), including the `#chapel-developers` IRC channel on Freenode.
Please visit Chapel's [Home Page](https://chapel-lang.org/)
2 changes: 1 addition & 1 deletion util/dockerfiles/gasnet/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM chapel/chapel-master:latest
FROM chapel/chapel:latest

ENV CHPL_COMM gasnet

Expand Down

0 comments on commit d44399d

Please sign in to comment.