From 4c4fd092f994f76f68654db75216239c7519951e Mon Sep 17 00:00:00 2001 From: Michael Gage Date: Sun, 30 Dec 2018 15:56:12 -0500 Subject: [PATCH] Update reference to PG_BRANCH in Docker config file. Update dates in license and update version numbers --- Dockerfile | 4 ++-- PG_VERSION | 2 +- README.md | 10 ++++++++++ VERSION | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4b26ba429f..0c4dfdde2f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:16.04 -ENV PG_BRANCH=rel-PG-2.14 \ +ENV PG_BRANCH=master \ WEBWORK_URL=/webwork2 \ WEBWORK_ROOT_URL=http://localhost \ WEBWORK_DB_HOST=db \ @@ -84,7 +84,7 @@ RUN mkdir -p $APP_ROOT/courses $APP_ROOT/libraries $APP_ROOT/webwork2 # Block to include webwork2 in the container, when needed, instead of getting it from a bind mount. # Uncomment when needed, and set the correct branch name on the following line. -#ENV WEBWORK_BRANCH=rel-ww2.14 # need a valid branch name from https://github.com/openwebwork/webwork2 +#ENV WEBWORK_BRANCH=master # need a valid branch name from https://github.com/openwebwork/webwork2 #RUN curl -fSL https://github.com/openwebwork/webwork2/archive/${WEBWORK_BRANCH}.tar.gz -o /tmp/${WEBWORK_BRANCH}.tar.gz \ # && cd /tmp \ # && tar xzf /tmp/${WEBWORK_BRANCH}.tar.gz \ diff --git a/PG_VERSION b/PG_VERSION index 2650dc99cd..c2a29f7f1a 100644 --- a/PG_VERSION +++ b/PG_VERSION @@ -1,4 +1,4 @@ $PG_VERSION ='PG-2.14'; -$PG_COPYRIGHT_YEARS = '1996-2018'; +$PG_COPYRIGHT_YEARS = '1996-2019'; 1; diff --git a/README.md b/README.md index 0040a125ad..6824d3d533 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,13 @@ + WeBWorK + Online Homework Delivery System + Version 2.* + Branch: github.com/openwebwork + + http://webwork.maa.org/wiki/Release_notes_for_WeBWorK_2.14 + Copyright 2000-2019, The WeBWorK Project + http://webwork.maa.org + All rights reserved. + # Welcome to WeBWorK WeBWorK is an open-source online homework system for math and sciences courses. WeBWorK is supported by the MAA and the NSF and comes with an Open Problem Library (OPL) of over 30,000 homework problems. Problems in the OPL target most lower division undergraduate math courses and some advanced courses. Supported courses include college algebra, discrete mathematics, probability and statistics, single and multivariable calculus, differential equations, linear algebra and complex analysis. Find out more at the main WeBWorK [webpage](http://webwork.maa.org). diff --git a/VERSION b/VERSION index c14171f9e5..7fa863cf31 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ $WW_VERSION = 'WeBWorK-2.14'; -$WW_COPYRIGHT_YEARS = '1996-2018'; +$WW_COPYRIGHT_YEARS = '1996-2019'; 1;