EDUCATIC
/
digitaldemocratic
mirror of https://gitlab.com/digitaldemocratic/digitaldemocratic
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into 'main' 

Upgrade erseco/alpine-php-webserver anda alpine-moodle containers

See merge request DD-workspace/DD!89
merge-requests/89/merge
Ernesto Serrano 2024-02-18 09:47:22 +00:00
parent ab820f9013 061692170e
commit fc49758677
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dd-apps/.gitmodules vendored
View File

@ -9,7 +9,7 @@
url = https://github.com/erseco/alpine-moodle.git url = https://github.com/erseco/alpine-moodle.git
[submodule "docker/moodle/rootfs-php7"] [submodule "docker/moodle/rootfs-php7"]
path = docker/moodle/rootfs-php7 path = docker/moodle/rootfs-php7
url = https://github.com/erseco/alpine-php7-webserver.git url = https://github.com/erseco/alpine-php-webserver.git
[submodule "docker/wordpress/plugins/saml"] [submodule "docker/wordpress/plugins/saml"]
path = docker/wordpress/plugins/saml path = docker/wordpress/plugins/saml
url = https://github.com/onelogin/wordpress-saml.git url = https://github.com/onelogin/wordpress-saml.git

6
dd-apps/docker/moodle/Dockerfile
View File

@ -10,9 +10,3 @@ COPY 03-plugins.sh /docker-entrypoint-init.d/
COPY src/rootfs/var/www/html/admin/cli/isinstalled.php / COPY src/rootfs/var/www/html/admin/cli/isinstalled.php /
COPY is_moodle_ready.sh / COPY is_moodle_ready.sh /
COPY nginx.conf /etc/nginx/ COPY nginx.conf /etc/nginx/
RUN echo "user=nobody" >> /etc/php7/php-fpm.d/www.conf
RUN echo "group=nobody" >> /etc/php7/php-fpm.d/www.conf
RUN apk add --no-cache dcron libcap && \
chown nobody:nobody /usr/sbin/crond && \
setcap cap_setgid=ep /usr/sbin/crond
RUN apk add php7-sodium