diff --git a/CHANGELOG.md b/CHANGELOG.md index e57a17a7..ca41d278 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,15 @@ # Changelog +<<<<<<< HEAD **v5.6.0(unreleased):** +======= +**v5.5.2:** + +* added wget to grade/Dockerfile -- this allows otter-grader version 4 generated autograder.zips to work with +otter-grader version 5 + +**v5.5.1:** +>>>>>>> 06f0ddeb (Otter Grade Dockerfile Added wget) * final_grades.csv: notebook name is the file name for each row instead of the full path to the notebook and the rows are sorted by notebook name diff --git a/otter/grade/Dockerfile b/otter/grade/Dockerfile index ba556e2e..ea78fbe0 100644 --- a/otter/grade/Dockerfile +++ b/otter/grade/Dockerfile @@ -4,7 +4,7 @@ FROM ${BASE_IMAGE} ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ - apt-get install -y curl unzip dos2unix && \ + apt-get install -y curl unzip dos2unix wget && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /var/tmp/*