.gitea/workflows/build.yaml

@@ -18,12 +18,10 @@ jobs:
         run: docker buildx create --name buildx --driver=docker-container
       - name: Build nginx-web
         run: docker buildx build --builder=buildx --platform=linux/amd64,linux/arm64 ./nginx-web -t git.tgj.services/thatguyjack/nginx-web:latest --push
-      - name: Build php-8.1-CLI
+      - name: Build php-CLI
-        run: docker buildx build --builder=buildx --platform=linux/amd64,linux/arm64 ./php-8-1-cli/ -t git.tgj.services/thatguyjack/php-cli:8.1 --push
+        run: docker buildx build --builder=buildx --platform=linux/amd64,linux/arm64 ./php-cli/ -t git.tgj.services/thatguyjack/php-cli:latest --push
-      - name: Build php-8.1-CLI
+      - name: Build motioneye
-        run: docker buildx build --builder=buildx --platform=linux/amd64,linux/arm64 ./php-8-1-cli/ -t git.tgj.services/thatguyjack/php-cli:latest --push
+        run: docker buildx build --builder=buildx --platform=linux/amd64,linux/arm64 ./motioneye -t git.tgj.services/thatguyjack/motioneye:latest --push
-      - name: Build php-8.2-CLI
-        run: docker buildx build --builder=buildx --platform=linux/amd64,linux/arm64 ./php-8-2-cli/ -t git.tgj.services/thatguyjack/php-cli:8.2 --push      
       - name: Build php-FPM
         run: docker buildx build --builder=buildx --platform=linux/amd64,linux/arm64 ./php-fpm/ -t git.tgj.services/thatguyjack/php-fpm:latest --push
 #      - name: Push

php-8-2-cli/Dockerfile

@@ -1,20 +0,0 @@
-FROM php:8.2-cli
-
-# installing cron package
-RUN apt-get update && apt-get -y install cron libbz2-dev curl libcurl4-openssl-dev libxml2-dev libenchant-2-dev libssl-dev libpng-dev libgmp-dev libzip-dev sudo rsync zip unzip libldap2-dev
-
-RUN pecl install redis && docker-php-ext-enable redis
-
-RUN docker-php-ext-install pdo_mysql opcache gd zip ldap
-
-COPY ./crontab /etc/cron.d/crontab
-
-#COPY ./petroq.service /etc/systemd/system
-#RUN systemctl enable --now pteroq.service
-RUN chmod 0644 /etc/cron.d/crontab
-
-RUN /usr/bin/crontab /etc/cron.d/crontab
-
-RUN adduser -D -H -u 1000 -s /bin/bash www-data -G www-data
-RUN usermod -u 1000 www-data
-RUN groupmod -g 1000 www-data

php-8-2-cli/crontab

@@ -1,6 +0,0 @@
-*/5  *  *  *  * sudo -u www-data php -d memory_limit=512M -f /var/www/nextcloud/cron.php
-
-* * * * * sudo -u www-data php -d memory_limit=512M /var/www/pterodactyl/artisan schedule:run >> /dev/null 2>&1
-* * * * * cd /var/www/invoice-ninja && sudo -u www-data php -d memory_limit=512M artisan schedule:run >> /dev/null 2>&1
-
-18 11 * * * /var/www/email.tgj.services/site/bin/cleandb.sh

php-8-2-cli/petroq.service

@@ -1,20 +0,0 @@
-# Pterodactyl Queue Worker File
-# ----------------------------------
-
-[Unit]
-Description=Pterodactyl Queue Worker
-After=redis-server.service
-
-[Service]
-# On some systems the user and group might be different.
-# Some systems use `apache` or `nginx` as the user and group.
-User=www-data
-Group=www-data
-Restart=always
-ExecStart=/usr/bin/php /var/www/pterodactyl/artisan queue:work --queue=high,standard,low --sleep=3 --tries=3
-StartLimitInterval=180
-StartLimitBurst=30
-RestartSec=5s
-
-[Install]
-WantedBy=multi-user.target