Skip to content

Fix docker compose #1618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 24, 2022
Merged

Fix docker compose #1618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6481c23
add libemail-stuffer-perl to Dockerfile
fabiangabel Mar 20, 2022
570b003
add missing backtick in docker-entrypoint.sh
fabiangabel Mar 20, 2022
efadf4b
add libemail-stuffer-perl changes to DockerfileStage1
fabiangabel Mar 20, 2022
54222f6
delete deprecated comments
fabiangabel Mar 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

# Do NOT include "apt-get -y upgrade"
# see: https://docs.docker.com/develop/develop-images/dockerfile_best-practices/

Expand Down Expand Up @@ -182,6 +179,7 @@ RUN apt-get update \
libjson-maybexs-perl \
libcpanel-json-xs-perl \
libyaml-libyaml-perl \
libemail-stuffer-perl \
make \
netpbm \
patch \
Expand Down
4 changes: 1 addition & 3 deletions DockerfileStage1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

# Do NOT include "apt-get -y upgrade"
# see: https://docs.docker.com/develop/develop-images/dockerfile_best-practices/

Expand Down Expand Up @@ -101,6 +98,7 @@ RUN apt-get update \
libjson-maybexs-perl \
libcpanel-json-xs-perl \
libyaml-libyaml-perl \
libemail-stuffer-perl \
make \
netpbm \
patch \
Expand Down
2 changes: 1 addition & 1 deletion docker-config/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down