From 7a31fe8bdc9ad4bd61507ac4646a26c24a5f4048 Mon Sep 17 00:00:00 2001 From: Soohhoon Choi Date: Tue, 7 Apr 2020 14:01:00 -0700 Subject: [PATCH 1/2] Update Dockerfile and README for Chapel Release 1.21.0: Release Branch Only Updated Docker file and REAME file to be consistent with the previous releases. Updated version to 1.21.0 and kept references to current and 1 previous release. --- util/dockerfiles/Dockerfile | 4 ++-- util/dockerfiles/README.md | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/util/dockerfiles/Dockerfile b/util/dockerfiles/Dockerfile index 64e4c1b80479..0995ce51e9e4 100644 --- a/util/dockerfiles/Dockerfile +++ b/util/dockerfiles/Dockerfile @@ -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.21.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/chpel-$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 diff --git a/util/dockerfiles/README.md b/util/dockerfiles/README.md index 75db045ee7de..2ef56d63f0ba 100644 --- a/util/dockerfiles/README.md +++ b/util/dockerfiles/README.md @@ -11,15 +11,15 @@ ## `chapel/chapel:` 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.21.0`, `latest` (_1.21.0/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.21/util/dockerfiles/Dockerfile/) +* [`1.20.0` (_1.20.0/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.20/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:`](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.21.0`, `latest` (_1.21.0/gasnet/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.21/util/dockerfiles/gasnet/Dockerfile/) +* [`1.20.0` (_1.20.0/gasnet/Dockerfile_)](https://github.com/chapel-lang/chapel/blob/release/1.20/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. @@ -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.20](https://chapel-lang.org/docs/1.20/). # License From 80af8c9c7b9db410b985b8d994faceaf2c4c45be Mon Sep 17 00:00:00 2001 From: Soohhoon Choi Date: Tue, 7 Apr 2020 14:07:36 -0700 Subject: [PATCH 2/2] fixed spelling error. --- util/dockerfiles/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/dockerfiles/Dockerfile b/util/dockerfiles/Dockerfile index 0995ce51e9e4..93da0a9fd7ab 100644 --- a/util/dockerfiles/Dockerfile +++ b/util/dockerfiles/Dockerfile @@ -26,7 +26,7 @@ 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/releases/download/$CHPL_VERSION/chpel-$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