From 8f9e4b23b15ea0332df12a5d17ded49fcdde3f1f Mon Sep 17 00:00:00 2001 From: shrkz1 Date: Tue, 11 Oct 2022 09:59:27 +0200 Subject: [PATCH 1/3] Removed obsolete file --- apache/directory.conf | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 apache/directory.conf diff --git a/apache/directory.conf b/apache/directory.conf deleted file mode 100644 index fcd64b4..0000000 --- a/apache/directory.conf +++ /dev/null @@ -1,5 +0,0 @@ - - Options Indexes FollowSymLinks - AllowOverride All - Require all granted - From 74957db339578fb142170a9821529b4f1c7bcb2f Mon Sep 17 00:00:00 2001 From: shrkz1 Date: Tue, 11 Oct 2022 09:59:43 +0200 Subject: [PATCH 2/3] Configured default redirect for non-SSL connection --- apache/vhost.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache/vhost.conf b/apache/vhost.conf index 46540bb..68cb245 100644 --- a/apache/vhost.conf +++ b/apache/vhost.conf @@ -20,5 +20,5 @@ ErrorLog ${APACHE_LOG_DIR}/error.log CustomLog ${APACHE_LOG_DIR}/access.log combined - # Redirect / https://localhost:443 + Redirect / https://localhost:8443/ From ae10f9672534ef4c8bf474c0e0df93fb3b06770a Mon Sep 17 00:00:00 2001 From: shrkz1 Date: Tue, 11 Oct 2022 10:00:09 +0200 Subject: [PATCH 3/3] Removed obsolete dockerfile --- Dockerfile | 66 ------------------------------------------------------ 1 file changed, 66 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 2b09f6c..0000000 --- a/Dockerfile +++ /dev/null @@ -1,66 +0,0 @@ -#FROM php:8.1-apache as pre-build -# -#RUN apt-get update && apt upgrade -y \ -# && apt install -y apt-utils vim wget curl libicu-dev libicu-dev libzip-dev libjpeg62-turbo-dev libpng-dev \ -# libfreetype6-dev libbz2-dev libldap2-dev libcurl4-openssl-dev openssl libssl-dev cron wkhtmltopdf zip unzip git -#RUN pecl install -o -f redis-5.3.7 -#RUN rm -rf /tmp/pear -#RUN docker-php-ext-install -j$(nproc) intl gd -#RUN docker-php-ext-install bz2 pdo_mysql zip exif ldap exif sysvsem -#RUN docker-php-ext-enable redis -# -#RUN cp -s /usr/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf - -## base -FROM ghcr.io/eramba/php:8.1-apache as base - -# Install rsync -RUN apt-get update && apt-get install -y rsync - -# Setup vhost -COPY app/upgrade/vendor/eramba/docker/apache/vhost.conf /etc/apache2/sites-available/000-default.conf - -# Copy keys -COPY app/upgrade/vendor/eramba/docker/apache/ssl/mycert.crt /etc/ssl/certs/mycert.crt -COPY app/upgrade/vendor/eramba/docker/apache/ssl/mycert.key /etc/ssl/private/mycert.key - -# Setup php -COPY app/upgrade/vendor/eramba/docker/php/php.ini /usr/local/etc/php/php.ini - -# Setup Cron tasks for eramba, hourly daily yearly cron with worker starting up every 10 minutes -COPY app/upgrade/vendor/eramba/docker/crontab/crontab /etc/cron.d/eramba-crontab - -RUN chmod 0644 /etc/cron.d/eramba-crontab -RUN chown www-data: /etc/cron.d/eramba-crontab -RUN crontab -u www-data /etc/cron.d/eramba-crontab -# Create the log file to be able to run tail -RUN touch /var/log/cron.log -RUN chown www-data: /var/log/cron.log -RUN chmod +w /var/log/cron.log - -RUN chmod gu+rw /var/run -RUN chmod gu+s /usr/sbin/cron - -RUN a2enmod rewrite -RUN a2enmod ssl && a2enmod socache_shmcb - -RUN mkdir /var/www/.composer -RUN mkdir -p /var/www/.cache/composer -RUN mkdir /var/www/.ssh - -RUN chown www-data: -R /var/www/ - - -## app -FROM base as eramba - -ARG UNAME=www-data - -COPY app/upgrade/vendor/eramba/docker/docker-entrypoint.sh /docker-entrypoint.sh -RUN chmod +x /docker-entrypoint.sh - -COPY --chown=$UNAME:$UNAME . /var/www/eramba -RUN su -s /bin/bash -c "cd /var/www/eramba && php composer.phar run-script post-install-cmd --no-interaction" $UNAME - -ENTRYPOINT ["/docker-entrypoint.sh"] -CMD ["apache2-foreground"]