This commit is contained in:
Roman Kelesidis 2025-08-21 15:13:58 +03:00
commit f7c65a24b0
No known key found for this signature in database
GPG key ID: D8157C4D4C4C6DB4
3 changed files with 27 additions and 9 deletions

View file

@ -2,6 +2,7 @@ FROM dunglas/frankenphp:1-php8.4
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
cron \ cron \
supervisor \
libicu-dev \ libicu-dev \
libtidy-dev \ libtidy-dev \
libjpeg-dev \ libjpeg-dev \
@ -18,18 +19,20 @@ RUN apt-get update && apt-get install -y \
tidy \ tidy \
xml \ xml \
xmlwriter \ xmlwriter \
zip \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
WORKDIR /app WORKDIR /app
COPY . /app COPY . /app
RUN echo "*/10 * * * * php /app/cron.php >> /var/log/cron.log 2>&1" > /etc/cron.d/app-cron \ RUN echo "*/10 * * * * php /app/cron.php >> /proc/1/fd/1 2>&1" > /etc/cron.d/app-cron \
&& chmod 0644 /etc/cron.d/app-cron \ && chmod 0644 /etc/cron.d/app-cron \
&& crontab /etc/cron.d/app-cron \ && crontab /etc/cron.d/app-cron
&& touch /var/log/cron.log
COPY install/Caddyfile /etc/caddy/Caddyfile COPY install/Caddyfile /etc/caddy/Caddyfile
COPY install/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
EXPOSE 80 443 EXPOSE 80
# EXPOSE 80 443
CMD service cron start && frankenphp run --config /etc/caddy/Caddyfile CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

View file

@ -6,11 +6,10 @@ services:
container_name: torrentpier-app container_name: torrentpier-app
ports: ports:
- "80:80" - "80:80"
- "443:443" # - "443:443"
env_file: env_file:
- .env - .env
volumes: volumes:
- ./:/app
- ./internal_data:/app/internal_data - ./internal_data:/app/internal_data
- ./data:/app/data - ./data:/app/data
- ./sitemap:/app/sitemap - ./sitemap:/app/sitemap
@ -30,8 +29,6 @@ services:
MYSQL_DATABASE: ${DB_DATABASE} MYSQL_DATABASE: ${DB_DATABASE}
MYSQL_USER: ${DB_USERNAME} MYSQL_USER: ${DB_USERNAME}
MYSQL_PASSWORD: ${DB_PASSWORD} MYSQL_PASSWORD: ${DB_PASSWORD}
ports:
- "${DB_PORT}:3306"
volumes: volumes:
- db_data:/var/lib/mysql - db_data:/var/lib/mysql
- ./install/mysql.sql:/docker-entrypoint-initdb.d/mysql.sql:ro - ./install/mysql.sql:/docker-entrypoint-initdb.d/mysql.sql:ro

18
install/supervisord.conf Normal file
View file

@ -0,0 +1,18 @@
[supervisord]
nodaemon=true
user=root
[program:cron]
command=cron -f
autostart=true
autorestart=true
stderr_logfile=/var/log/cron.err.log
stdout_logfile=/var/log/cron.out.log
[program:frankenphp]
command=frankenphp run --config /etc/caddy/Caddyfile
directory=/app
autostart=true
autorestart=true
stderr_logfile=/var/log/frankenphp.err.log
stdout_logfile=/var/log/frankenphp.out.log