From f61e3211cb8abef22208779f5b72c142c93f5b85 Mon Sep 17 00:00:00 2001
From: Glenn Rice <grice1@missouriwestern.edu>
Date: Thu, 22 Feb 2024 14:24:13 -0600
Subject: [PATCH] Fix the docker build.

---
 Dockerfile                         | 2 +-
 DockerfileStage1                   | 4 ++--
 docker-config/docker-entrypoint.sh | 6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f735e07e69..42eee229fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -95,6 +95,7 @@ RUN apt-get update \
 	libextutils-helpers-perl \
 	libextutils-installpaths-perl \
 	libextutils-xsbuilder-perl \
+	libfile-copy-recursive-perl \
 	libfile-find-rule-perl-perl \
 	libfile-sharedir-install-perl \
 	libfuture-asyncawait-perl \
@@ -131,7 +132,6 @@ RUN apt-get update \
 	libphp-serialization-perl \
 	libpod-wsdl-perl \
 	libsoap-lite-perl \
-	libsql-abstract-classic-perl \
 	libsql-abstract-perl \
 	libstring-shellquote-perl \
 	libsub-uplevel-perl \
diff --git a/DockerfileStage1 b/DockerfileStage1
index 85357f3597..19f17bdc96 100644
--- a/DockerfileStage1
+++ b/DockerfileStage1
@@ -57,6 +57,7 @@ RUN apt-get update \
 	libextutils-helpers-perl \
 	libextutils-installpaths-perl \
 	libextutils-xsbuilder-perl \
+	libfile-copy-recursive-perl \
 	libfile-find-rule-perl-perl \
 	libfile-sharedir-install-perl \
 	libfuture-asyncawait-perl \
@@ -93,7 +94,6 @@ RUN apt-get update \
 	libphp-serialization-perl \
 	libpod-wsdl-perl \
 	libsoap-lite-perl \
-	libsql-abstract-classic-perl \
 	libsql-abstract-perl \
 	libstring-shellquote-perl \
 	libsub-uplevel-perl \
@@ -139,7 +139,7 @@ RUN apt-get update \
 	texlive-xetex \
 	tzdata \
 	zip $ADDITIONAL_BASE_IMAGE_PACKAGES \
-	&& curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \
+	&& curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
 	&& apt-get install -y --no-install-recommends --no-install-suggests nodejs \
 	&& apt-get clean \
 	&& rm -fr /var/lib/apt/lists/* /tmp/*
diff --git a/docker-config/docker-entrypoint.sh b/docker-config/docker-entrypoint.sh
index d7a5a07968..0f8de6e175 100755
--- a/docker-config/docker-entrypoint.sh
+++ b/docker-config/docker-entrypoint.sh
@@ -192,6 +192,12 @@ then
 	cp -a $WEBWORK_ROOT/htdocs/DATA/*.json $APP_ROOT/libraries/webwork-open-problem-library/JSON-SAVED
 fi
 
+# Make sure the archives subdirectory of the admin course exists.
+if [ ! -d $APP_ROOT/courses/admin/archives ]
+then
+	mkdir $APP_ROOT/courses/admin/archives
+fi
+
 # Fix possible permission issues
 echo "Fixing ownership and permissions (just in case it is needed)"
 cd $WEBWORK_ROOT