Skip to content
Merged
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ FROM ghcr.io/eramba/php:8.1-apache as base
RUN apt-get update && apt-get install -y rsync

# Setup vhost
COPY ./docker/apache/vhost.conf /etc/apache2/sites-available/000-default.conf
COPY app/upgrade/vendor/eramba/docker/apache/vhost.conf /etc/apache2/sites-available/000-default.conf

# Setup php
COPY ./docker/php/php.ini /usr/local/etc/php/php.ini
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 ./docker/crontab/crontab /etc/cron.d/eramba-crontab
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
Expand All @@ -51,7 +51,7 @@ FROM base as eramba

ARG UNAME=www-data

COPY ./docker/docker-entrypoint.sh /docker-entrypoint.sh
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
Expand Down