diff --git a/example.env b/example.env index ad5ed65..be45a15 100644 --- a/example.env +++ b/example.env @@ -1,10 +1,9 @@ - # environment for MYSQL MYSQL_ROOT_PASSWORD=yourmysqlrootpassword MYSQL_DATABASE=gibbon MYSQL_USER=gibbon MYSQL_PASSWORD=yourmysqlgibbonrandompassword -LANG=de_DE.utf8 +LANG=en_US.utf8 GIBBON_SITENAME=gibbon@yourdomain.edu GIBBON_BASEDIR=/var/www/html @@ -12,9 +11,9 @@ GIBBON_BASEDIR=/var/www/html SERVER_ADMIN_MAIL=admin@yourdomain.edu MAILNAME=gibbon@yourdomain.edu -GIBBON_VERSION=21.0.01 +GIBBON_VERSION=25.0.00 SMARTHOST_ADDRESS=yourmailserver@yourdomain.edu SMARTHOST_PORT=25 SMARTHOST_USER=yourmailuser SMARTHOST_PASSWORD=yourmailuserpassword -SMARTHOST_ALIASES=*.yourdomain.edu +SMARTHOST_ALIASES=*.yourdomain.edu \ No newline at end of file diff --git a/php/Dockerfile b/php/Dockerfile index 3b8ae7b..0914d3e 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -25,3 +25,5 @@ RUN apk add rsync \ && cp "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini" \ && chmod 0755 /usr/local/bin/docker-php-gibbonsetup \ && sed -i "`wc -l < /usr/local/bin/docker-php-entrypoint`i\\/usr/local/bin/docker-php-gibbonsetup\\" /usr/local/bin/docker-php-entrypoint + +COPY --from=composer/composer /usr/bin/composer /usr/bin/composer diff --git a/php/docker-php-gibbonsetup b/php/docker-php-gibbonsetup index e24d1ed..0a2c7d5 100644 --- a/php/docker-php-gibbonsetup +++ b/php/docker-php-gibbonsetup @@ -28,3 +28,6 @@ else sed -i "s/$databasePassword = .*$/$databasePassword = '${GIBBON_DB_PASSWORD}';/g" ${GIBBON_BASEDIR}/config.php sed -i "s/$databaseName = .*$/$databaseName = '${GIBBON_DB_DB}';/g" ${GIBBON_BASEDIR}/config.php fi + +cd /var/www/html/ +composer install \ No newline at end of file