diff --git a/Dockerfile b/Dockerfile index 2336f2dcd4..0c3f7ff000 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,7 +33,7 @@ RUN echo Cloning branch $PG_BRANCH branch from $PG_GIT_URL \ FROM ubuntu:24.04 ENV WEBWORK_URL=/webwork2 \ - WEBWORK_ROOT_URL=http://localhost::8080 \ + WEBWORK_ROOT_URL=http://localhost:8080 \ WEBWORK_SMTP_SERVER=localhost \ WEBWORK_SMTP_SENDER=webwork@example.com \ WEBWORK_TIMEZONE=America/New_York \ @@ -190,6 +190,7 @@ RUN cpanm install -n \ DBD::MariaDB \ Perl::Tidy@20220613 \ Archive::Zip::SimpleZip \ + SQL::Abstract::Classic \ Net::SAML2 \ && rm -fr ./cpanm /root/.cpanm /tmp/* diff --git a/DockerfileStage1 b/DockerfileStage1 index 092b450ee9..541818ecbe 100644 --- a/DockerfileStage1 +++ b/DockerfileStage1 @@ -152,6 +152,7 @@ RUN cpanm install -n \ DBD::MariaDB \ Perl::Tidy@20220613 \ Archive::Zip::SimpleZip \ + SQL::Abstract::Classic \ Net::SAML2 \ && rm -fr ./cpanm /root/.cpanm /tmp/* diff --git a/DockerfileStage2 b/DockerfileStage2 index 59c6828e48..ddd48c17d9 100644 --- a/DockerfileStage2 +++ b/DockerfileStage2 @@ -36,7 +36,7 @@ RUN echo Cloning branch $PG_BRANCH branch from $PG_GIT_URL \ FROM webwork-base:forWW219 ENV WEBWORK_URL=/webwork2 \ - WEBWORK_ROOT_URL=http://localhost::8080 \ + WEBWORK_ROOT_URL=http://localhost:8080 \ WEBWORK_SMTP_SERVER=localhost \ WEBWORK_SMTP_SENDER=webwork@example.com \ WEBWORK_TIMEZONE=America/New_York \ diff --git a/docker-config/docker-compose.dist.yml b/docker-config/docker-compose.dist.yml index 2788d5b278..a168a9f96e 100644 --- a/docker-config/docker-compose.dist.yml +++ b/docker-config/docker-compose.dist.yml @@ -1,4 +1,3 @@ -version: '3.5' services: db: image: mariadb:10.4