Compare commits

...

2 Commits

Author SHA1 Message Date
2e4028d623 upd: docker-compose
Add logging notation
2026-03-26 19:58:21 -04:00
5e6d63ef26 upd: Dockerfile
remove logrotate functionality in favor of docker native logging
2026-03-26 19:57:59 -04:00
6 changed files with 61 additions and 18 deletions

View File

@@ -15,7 +15,6 @@ RUN apt update && \
curl \ curl \
git \ git \
cron \ cron \
logrotate \
nano nano
RUN service start cron RUN service start cron
@@ -51,16 +50,6 @@ RUN mv 000-default.conf /etc/apache2/sites-available/
RUN echo "20 1 * * 6 root cd /var/www/html && /usr/local/bin/php bin/console app:get-audio > /var/log/sermon-notes.log 2>&1" > /etc/cron.d/get-audio RUN echo "20 1 * * 6 root cd /var/www/html && /usr/local/bin/php bin/console app:get-audio > /var/log/sermon-notes.log 2>&1" > /etc/cron.d/get-audio
RUN chmod 644 /etc/cron.d/get-audio RUN chmod 644 /etc/cron.d/get-audio
RUN echo "/var/log/sermon-notes.log {
monthly
rotate 12
compress
delaycompress
missingok
notifempty
create 644 root root
}" > /etc/logrotate.d/sermon-notes
RUN COMPOSER_ALLOW_SUPERUSER=1 composer install --no-scripts --no-dev --optimize-autoloader RUN COMPOSER_ALLOW_SUPERUSER=1 composer install --no-scripts --no-dev --optimize-autoloader
RUN /usr/local/bin/php bin/console asset-map:compile RUN /usr/local/bin/php bin/console asset-map:compile
RUN mkdir /data RUN mkdir /data

View File

@@ -1,22 +1,34 @@
services: services:
sermon-notes: sermon-notes:
image: gitea.rkprather.com/ryan/sermon-notes:latest image: gitea.rkprather.com/ryan/sermon-notes:1.3
container_name: sermon-notes container_name: sermon-notes
hostname: sermon-notes hostname: sermon-notes
restart: unless-stopped restart: unless-stopped
env_file: .env env_file: .env
ports: ports:
- ${HTTP_PORT}:80 - ${HTTP_PORT}:80
volumes: volumes:
- ${PWD}/.env:/var/www/html/.env - ${PWD}/.env:/var/www/html/.env
logging:
driver: "json-file"
options:
max-size: "10m"
max-file: "3"
depends_on: depends_on:
- db - db
db: db:
image: mariadb image: mariadb:12.3
container_name: db container_name: db
hostname: db hostname: db
restart: unless-stopped restart: unless-stopped
env_file: .env env_file: .env
volumes: volumes:
- ${PWD}/db_data:/var/lib/mysql - ${PWD}/db_data:/var/lib/mysql

View File

@@ -1,22 +1,34 @@
services: services:
sermon-notes: sermon-notes:
image: gitea.rkprather.com/ryan/sermon-notes:latest image: gitea.rkprather.com/ryan/sermon-notes:1.3
container_name: sermon-notes container_name: sermon-notes
hostname: sermon-notes hostname: sermon-notes
restart: unless-stopped restart: unless-stopped
env_file: .env env_file: .env
ports: ports:
- ${HTTP_PORT}:80 - ${HTTP_PORT}:80
volumes: volumes:
- ${PWD}/.env:/var/www/html/.env - ${PWD}/.env:/var/www/html/.env
logging:
driver: "json-file"
options:
max-size: "10m"
max-file: "3"
depends_on: depends_on:
- db - db
db: db:
image: mysql image: mysql:9.6
container_name: db container_name: db
hostname: db hostname: db
restart: unless-stopped restart: unless-stopped
env_file: .env env_file: .env
volumes: volumes:
- ${PWD}/db-data:/var/lib/mysql - ${PWD}/db-data:/var/lib/mysql

View File

@@ -1,14 +1,24 @@
services: services:
sermon-notes: sermon-notes:
container_name: sermon-notes container_name: sermon-notes
image: gitea.rkprather.com/ryan/sermon-notes:latest image: gitea.rkprather.com/ryan/sermon-notes:1.3
hostname: sermon-notes hostname: sermon-notes
restart: unless-stopped restart: unless-stopped
env_file: .env env_file: .env
ports: ports:
- ${HTTP_PORT}:80 - ${HTTP_PORT}:80
volumes: volumes:
- ${PWD}/.env:/var/www/html/.env - ${PWD}/.env:/var/www/html/.env
logging:
driver: "json-file"
options:
max-size: "10m"
max-file: "3"
depends_on: depends_on:
- db - db
@@ -17,7 +27,9 @@ services:
container_name: db container_name: db
hostname: db hostname: db
restart: unless-stopped restart: unless-stopped
env_file: .env env_file: .env
volumes: volumes:
- ${PWD}/db-data:/var/lib/postgresql/data - ${PWD}/db-data:/var/lib/postgresql/data

View File

@@ -1,11 +1,20 @@
services: services:
sermon-notes: sermon-notes:
image: gitea.rkprather.com/ryan/sermon-notes:latest image: gitea.rkprather.com/ryan/sermon-notes:1.3
container_name: sermon-notes container_name: sermon-notes
hostname: sermon-notes hostname: sermon-notes
restart: unless-stopped restart: unless-stopped
env_file: .env env_file: .env
ports: ports:
- ${HTTP_PORT}:80 - ${HTTP_PORT}:80
volumes: volumes:
- ${PWD}/.env:/var/www/html/.env - ${PWD}/.env:/var/www/html/.env
logging:
driver: "json-file"
options:
max-size: "10m"
max-file: "3"

View File

@@ -1,12 +1,21 @@
services: services:
sermon-notes: sermon-notes:
image: gitea.rkprather.com/ryan/sermon-notes:latest image: gitea.rkprather.com/ryan/sermon-notes:1.3
container_name: sermon-notes container_name: sermon-notes
hostname: sermon-notes hostname: sermon-notes
restart: unless-stopped restart: unless-stopped
env_file: .env env_file: .env
ports: ports:
- ${HTTP_PORT}:80 - ${HTTP_PORT}:80
volumes: volumes:
- ${PWD}/data:/data - ${PWD}/data:/data
- ${PWD}/.env:/var/www/html/.env - ${PWD}/.env:/var/www/html/.env
logging:
driver: "json-file"
options:
max-size: "10m"
max-file: "3"