From 6481c23db223ef686cb0c5438f22f0efae4411d0 Mon Sep 17 00:00:00 2001
From: Fabian Gabel <fabian.gabel@tuhh.de>
Date: Sun, 20 Mar 2022 14:25:27 +0100
Subject: [PATCH 1/4] add libemail-stuffer-perl to Dockerfile

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 528955341f..abc0412851 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -98,7 +98,7 @@ ENV WEBWORK_ROOT=$APP_ROOT/webwork2 \
 # Phase 3 - Ubuntu 20.04 base image + required packages
 
 # Packages changes/added for ubuntu 20.04:
-#       libcgi-pm-perl (for CGI::Cookie), libdbd-mariadb-perl
+#       libcgi-pm-perl (for CGI::Cookie), libdbd-mariadb-perl, libemail-stuffer-perl
 
 # Do NOT include "apt-get -y upgrade"
 # see: https://docs.docker.com/develop/develop-images/dockerfile_best-practices/
@@ -182,6 +182,7 @@ RUN apt-get update \
 	libjson-maybexs-perl \
 	libcpanel-json-xs-perl \
 	libyaml-libyaml-perl \
+	libemail-stuffer-perl \
 	make \
 	netpbm \
 	patch \

From 570b003e07080fbc1419a7150000ea03ecd6c278 Mon Sep 17 00:00:00 2001
From: Fabian Gabel <fabian.gabel@tuhh.de>
Date: Sun, 20 Mar 2022 14:25:56 +0100
Subject: [PATCH 2/4] add missing backtick in docker-entrypoint.sh

probably introduced with commit f26c2174d035dc54b7947f8efffa3c0244757d1b
Check

 git diff WeBWorK-2.16 f26c2174d035dc54b7947f8efffa3c0244757d1b docker-config/docker-entrypoint.sh

 for details.
---
 docker-config/docker-entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-config/docker-entrypoint.sh b/docker-config/docker-entrypoint.sh
index 7364c5c834..1a094fe9d3 100755
--- a/docker-config/docker-entrypoint.sh
+++ b/docker-config/docker-entrypoint.sh
@@ -100,7 +100,7 @@ if [ "$1" = 'apache2' ]; then
 
     echo "check admin course and admin tables"
     wait_for_db
-    ADMIN_TABLE_EXISTS=`mysql -u $WEBWORK_DB_USER  -p$WEBWORK_DB_PASSWORD -B -N -h $WEBWORK_DB_HOST -e "select count(*) from information_schema.tables where table_schema='webwork' and table_name = 'admin_user';" 
+    ADMIN_TABLE_EXISTS=`mysql -u $WEBWORK_DB_USER  -p$WEBWORK_DB_PASSWORD -B -N -h $WEBWORK_DB_HOST -e "select count(*) from information_schema.tables where table_schema='webwork' and table_name = 'admin_user';"`
     if [ ! -d "$APP_ROOT/courses/admin" ]; then
         newgrp www-data
         umask 2

From efadf4b2a9de80048707959e1685fa3965240e51 Mon Sep 17 00:00:00 2001
From: Fabian Gabel <fabian.gabel@tuhh.de>
Date: Sun, 20 Mar 2022 14:37:16 +0100
Subject: [PATCH 3/4] add libemail-stuffer-perl changes to DockerfileStage1

---
 DockerfileStage1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/DockerfileStage1 b/DockerfileStage1
index 24355a94c4..03868ec21b 100644
--- a/DockerfileStage1
+++ b/DockerfileStage1
@@ -17,7 +17,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
 # Phase 2 - Ubuntu 20.04 base image + required packages
 
 # Packages changes/added for ubuntu 20.04:
-#       libcgi-pm-perl (for CGI::Cookie), libdbd-mariadb-perl
+#       libcgi-pm-perl (for CGI::Cookie), libdbd-mariadb-perl, libemail-stuffer-perl
 
 # Do NOT include "apt-get -y upgrade"
 # see: https://docs.docker.com/develop/develop-images/dockerfile_best-practices/
@@ -101,6 +101,7 @@ RUN apt-get update \
 	libjson-maybexs-perl \
 	libcpanel-json-xs-perl \
 	libyaml-libyaml-perl \
+	libemail-stuffer-perl \
 	make \
 	netpbm \
 	patch \

From 54222f6f75298002d8aa8a5ad6d8cf5f1a6e727c Mon Sep 17 00:00:00 2001
From: Fabian Gabel <fabian.gabel@tuhh.de>
Date: Sun, 20 Mar 2022 21:14:40 +0100
Subject: [PATCH 4/4] delete deprecated comments

---
 Dockerfile       | 3 ---
 DockerfileStage1 | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index abc0412851..5a55179b40 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -97,9 +97,6 @@ ENV WEBWORK_ROOT=$APP_ROOT/webwork2 \
 
 # Phase 3 - Ubuntu 20.04 base image + required packages
 
-# Packages changes/added for ubuntu 20.04:
-#       libcgi-pm-perl (for CGI::Cookie), libdbd-mariadb-perl, libemail-stuffer-perl
-
 # Do NOT include "apt-get -y upgrade"
 # see: https://docs.docker.com/develop/develop-images/dockerfile_best-practices/
 
diff --git a/DockerfileStage1 b/DockerfileStage1
index 03868ec21b..34535f0e21 100644
--- a/DockerfileStage1
+++ b/DockerfileStage1
@@ -16,9 +16,6 @@ ENV DEBIAN_FRONTEND=noninteractive \
 
 # Phase 2 - Ubuntu 20.04 base image + required packages
 
-# Packages changes/added for ubuntu 20.04:
-#       libcgi-pm-perl (for CGI::Cookie), libdbd-mariadb-perl, libemail-stuffer-perl
-
 # Do NOT include "apt-get -y upgrade"
 # see: https://docs.docker.com/develop/develop-images/dockerfile_best-practices/