Update Dockerfile

.gitea/workflows/build.yaml

@@ -13,18 +13,20 @@ jobs:
       - name: Clone
         run: git clone https://git.tgj.services/thatguyjack/custom-docker-containers.git .
       - name: Login
-        run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login git.tgj.services -u thatguyjack --password-stdin
+        run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login https://git.tgj.services -u ThatGuyJack --password-stdin
-      - name: Build php-FPM
+      - name: Buildx Container 
-        run: docker build ./php-fpm/ -t git.tgj.services/thatguyjack/php-fpm:latest
+        run: docker buildx create --name buildx --driver=docker-container
-      - name: Build php-CLI
-        run: docker build ./php-cli/ -t git.tgj.services/thatguyjack/php-cli:latest
       - name: Build nginx-web
-        run: docker build ./nginx-web -t git.tgj.services/thatguyjack/nginx-web:latest
+        run: docker buildx build --builder=buildx --platform=linux/amd64 ./nginx-web -t git.tgj.services/thatguyjack/nginx-web:latest --push
-      - name: Build motioneye
+      - name: Build php-8.1-CLI
-        run: docker build ./motioneye -t git.tgj.services/thatguyjack/motioneye:latest
+        run: docker buildx build --builder=buildx --platform=linux/amd64 ./php-8-1-cli/ -t git.tgj.services/thatguyjack/php-cli:8.1 --push    
-      - name: Push
+      - name: Build php8-1-FPM
-        run: |
+        run: docker buildx build --builder=buildx --platform=linux/amd64 ./php-8-1-fpm/ -t git.tgj.services/thatguyjack/php-fpm:8.1 --push
-          docker push git.tgj.services/thatguyjack/php-fpm:latest
+      - name: Build php-8-2-FPM
-          docker push git.tgj.services/thatguyjack/php-cli:latest
+        run: docker buildx build --builder=buildx --platform=linux/amd64 ./php-8-2-fpm/ -t git.tgj.services/thatguyjack/php-fpm:8.2 --push
-          docker push git.tgj.services/thatguyjack/nginx-web:latest
+#      - name: Push
-          docker push git.tgj.services/thatguyjack/motioneye:latest
+#        run: |
+#          docker push git.tgj.services/thatguyjack/php-fpm:latest
+#          docker push git.tgj.services/thatguyjack/php-cli:latest
+#          docker push git.tgj.services/thatguyjack/nginx-web:latest
+#          docker push git.tgj.services/thatguyjack/motioneye:latest

Archive/php-8-2-cli/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.1-cli
+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
@@ -9,6 +9,8 @@ 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

Archive/php-8-2-cli/petroq.service

@@ -0,0 +1,20 @@
+# 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

motioneye/Dockerfile

@@ -20,20 +20,23 @@ RUN case "$(dpkg --print-architecture)" in \
     DEBIAN_FRONTEND="noninteractive" apt-get -qq --option Dpkg::Options::="--force-confnew" --no-install-recommends install \
       ca-certificates curl python3 fdisk $PACKAGES && \
     curl -sSfO 'https://bootstrap.pypa.io/get-pip.py' && \
-    python3 get-pip.py && \
+    python3 get-pip.py
-    python3 -m pip install --no-cache-dir --upgrade pip setuptools wheel && \
+
+RUN python3 -m pip install --no-cache-dir --upgrade pip setuptools wheel && \
     python3 -m pip install --no-cache-dir /tmp/motioneye && \
     python3 -m pip install --no-cache-dir pytz && \
-    motioneye_init --skip-systemd --skip-apt-update && \
+    motioneye_init --skip-systemd --skip-apt-update
+
     # Change uid/gid of user/group motion to match our desired IDs. This will
     # make it easier to use execute motion as our desired user later.
-    sed -i "s/^\(motion:[^:]*\):[0-9]*:[0-9]*:\(.*\)/\1:${RUN_UID}:${RUN_GID}:\2/" /etc/passwd && \
+RUN    sed -i "s/^\(motion:[^:]*\):[0-9]*:[0-9]*:\(.*\)/\1:${RUN_UID}:${RUN_GID}:\2/" /etc/passwd && \
     sed -i "s/^\(motion:[^:]*\):[0-9]*:\(.*\)/\1:${RUN_GID}:\2/" /etc/group && \
     mv /etc/motioneye/motioneye.conf /etc/motioneye.conf.sample && \
     mkdir /var/log/motioneye /var/lib/motioneye && \
-    chown motion:motion /var/log/motioneye /var/lib/motioneye && \
+    chown motion:motion /var/log/motioneye /var/lib/motioneye
+   
     # Cleanup
-    python3 -m pip uninstall -y pip setuptools wheel && \
+RUN python3 -m pip uninstall -y pip setuptools wheel && \
     DEBIAN_FRONTEND="noninteractive" apt-get -qq autopurge $PACKAGES && \
     apt-get clean && \
     rm -r /var/lib/apt/lists /var/cache/apt /tmp/motioneye get-pip.py /root/.cache

nginx-web/configs/nginx.conf

@@ -12,13 +12,14 @@ http {
 	server_names_hash_bucket_size  128;
 #	set_real_ip_from 172.18.0.0/16;
 #    set_real_ip_from fd00:0:0:0:2::/64;
+    real_ip_recursive on;
 	real_ip_header X-Forwarded-For;
 	proxy_set_header Host  $host;
 	proxy_set_header X-Real-IP $remote_addr;
 	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
-	sub_filter '</head>' '<script async="" src="https://ip-update.net/ipupdate.js"></script> </head>';
+#	sub_filter '</head>' '<script async="" src="https://ip-update.net/ipupdate.js"></script> </head>';
-	sub_filter_once on;
+#	sub_filter_once on;
 
 	##
 	# Basic Settings

php-8-1-cli/Dockerfile

@@ -0,0 +1,21 @@
+FROM php:8.1-cli
+
+RUN apt update && apt upgrade -y
+# 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-1-cli/petroq.service

@@ -0,0 +1,20 @@
+# 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

php-8-1-fpm/Dockerfile

@@ -0,0 +1,82 @@
+FROM php:8.1-fpm-alpine
+
+ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+
+RUN apk update && apk upgrade
+
+COPY ./config/php.ini-production "$PHP_INI_DIR/php.ini-production"
+COPY ./config/pool.d "$PHP_INI_DIR/"
+RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+
+RUN apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
+    && pecl install uploadprogress \
+    && docker-php-ext-enable uploadprogress \
+    && apk del .build-deps $PHPIZE_DEPS \
+    && chmod uga+x /usr/local/bin/install-php-extensions && sync
+
+RUN install-php-extensions bcmath \
+            bz2 \
+            smbclient \
+            calendar \
+            curl \
+            exif \
+            fileinfo \
+            ftp \
+            gd \
+            gettext \
+            imagick \
+            imap \
+            intl \
+            ldap \
+            mbstring \
+            mcrypt \
+            memcached \
+            mongodb \
+            mysqli \
+            opcache \
+            openssl \
+            pdo \
+            pdo_mysql \
+            redis \
+            soap \
+            sodium \
+            sysvsem \
+            sysvshm \
+            xmlrpc \
+            xsl \
+            zip \
+            gmp 
+
+#RUN apk add --no-cache ssmbclient
+
+RUN echo -e "\n opcache.enable=1 \n opcache.enable_cli=1 \n opcache.memory_consumption=2048 \n opcache.interned_strings_buffer=1024 \n opcache.max_accelerated_files=8000 \n opcache.revalidate_freq=60 \n opcache.fast_shutdown=1" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini \
+    &&  echo -e "\n xdebug.remote_enable=1 \n xdebug.remote_host=localhost \n xdebug.remote_port=9000" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
+    &&  echo -e "\n xhprof.output_dir='/var/tmp/xhprof'" >> /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini \
+    && cd ~ 
+
+# Install composer
+RUN  php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
+    && php -r "copy('https://composer.github.io/installer.sig', 'signature');" \
+    && php -r "if (hash_file('SHA384', 'composer-setup.php') === trim(file_get_contents('signature'))) { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+    && php composer-setup.php --install-dir=/usr/local/bin --filename=composer \
+    && php -r "unlink('composer-setup.php');"
+
+# Install WP-CLI
+RUN curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar \
+    && chmod +x wp-cli.phar \
+    && mv wp-cli.phar /usr/local/bin/wp
+
+# Install msmtp - To Send Mails on Production & Development
+RUN apk add msmtp
+
+RUN apk add --no-cache gnupg
+
+# modify www-data user to have id 1000
+RUN apk add \
+        --no-cache \
+        --repository http://dl-3.alpinelinux.org/alpine/edge/community/ --allow-untrusted \
+        --virtual .shadow-deps \
+        shadow \
+    && usermod -u 1000 www-data \
+    && groupmod -g 1000 www-data \
+    && apk del .shadow-deps

php-8-2-fpm/Dockerfile

@@ -1,7 +1,9 @@
-FROM php:8.1-fpm-alpine
+FROM php:8.2-fpm-alpine
 
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
+RUN apk update && apk upgrade
+
 COPY ./config/php.ini-production "$PHP_INI_DIR/php.ini-production"
 COPY ./config/pool.d "$PHP_INI_DIR/"
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
@@ -13,6 +15,7 @@ RUN apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
     && chmod uga+x /usr/local/bin/install-php-extensions && sync
 
 RUN install-php-extensions bcmath \
+            gmp \
             bz2 \
             smbclient \
             calendar \
@@ -43,10 +46,10 @@ RUN install-php-extensions bcmath \
             xmlrpc \
             xsl \
             zip \
-            gmp 
+            bcmath
-
-#RUN apk add --no-cache ssmbclient
 
+#RUN apk add --no-cache libnss3-dev libatk1.0-0 libatk-bridge2.0-0 libcups2 libgbm1 libpangocairo-1.0-0 libgtk-3-0
+RUN apk add chromium
 RUN  echo -e "\n opcache.enable=1 \n opcache.enable_cli=1 \n opcache.memory_consumption=2048 \n opcache.interned_strings_buffer=1024 \n opcache.max_accelerated_files=8000 \n opcache.revalidate_freq=60 \n opcache.fast_shutdown=1" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini \
     &&  echo -e "\n xdebug.remote_enable=1 \n xdebug.remote_host=localhost \n xdebug.remote_port=9000" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
     &&  echo -e "\n xhprof.output_dir='/var/tmp/xhprof'" >> /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini \
@@ -75,3 +78,15 @@ RUN apk add \
     && usermod -u 1000 www-data \
     && groupmod -g 1000 www-data \
     && apk del .shadow-deps
+
+RUN apk add sudo bash
+
+COPY ./crontab /etc/cron.d/crontab
+
+RUN chmod 0644 /etc/cron.d/crontab
+
+RUN /usr/bin/crontab /etc/cron.d/crontab
+
+RUN touch /var/log/cron.log
+
+CMD bash -c "crond -f -d 8 & php-fpm"

php-8-2-fpm/config/conf.d/10-mysqlnd.ini

@@ -0,0 +1,3 @@
+; configuration for php mysql module
+; priority=10
+extension=mysqlnd.so

php-8-2-fpm/config/conf.d/10-opcache.ini

@@ -0,0 +1,4 @@
+; configuration for php opcache module
+; priority=10
+zend_extension=opcache.so
+opcache.jit=off

php-8-2-fpm/config/conf.d/10-pdo.ini

@@ -0,0 +1,3 @@
+; configuration for php common module
+; priority=10
+extension=pdo.so

php-8-2-fpm/config/conf.d/15-xml.ini

@@ -0,0 +1,3 @@
+; configuration for php xml module
+; priority=15
+extension=xml.so

php-8-2-fpm/config/conf.d/20-apcu.ini

@@ -0,0 +1 @@
+extension=apcu.so

php-8-2-fpm/config/conf.d/20-bcmath.ini

@@ -0,0 +1,3 @@
+; configuration for php bcmath module
+; priority=20
+extension=bcmath.so

php-8-2-fpm/config/conf.d/20-calendar.ini

@@ -0,0 +1,3 @@
+; configuration for php common module
+; priority=20
+extension=calendar.so

php-8-2-fpm/config/conf.d/20-ctype.ini

@@ -0,0 +1,3 @@
+; configuration for php common module
+; priority=20
+extension=ctype.so

php-8-2-fpm/config/conf.d/20-curl.ini

@@ -0,0 +1,3 @@
+; configuration for php curl module
+; priority=20
+extension=curl.so

php-8-2-fpm/config/conf.d/20-dom.ini

@@ -0,0 +1,3 @@
+; configuration for php xml module
+; priority=20
+extension=dom.so

php-8-2-fpm/config/conf.d/20-exif.ini

@@ -0,0 +1,3 @@
+; configuration for php common module
+; priority=20
+extension=exif.so

php-8-2-fpm/config/conf.d/20-ffi.ini

@@ -0,0 +1,3 @@
+; configuration for php common module
+; priority=20
+extension=ffi.so

php-8-2-fpm/config/conf.d/20-fileinfo.ini

@@ -0,0 +1,3 @@
+; configuration for php common module
+; priority=20
+extension=fileinfo.so

php-8-2-fpm/config/conf.d/20-ftp.ini

@@ -0,0 +1,3 @@
+; configuration for php common module
+; priority=20
+extension=ftp.so

php-8-2-fpm/config/conf.d/20-gd.ini

@@ -0,0 +1,3 @@
+; configuration for php gd module
+; priority=20
+extension=gd.so