diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 2e2596a..c25a5d7 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -2,12 +2,12 @@ name: Build and publish whmcs-php-fpm docker image on: push: - branches: [master] + branches: [docker-images] paths: - - 'docker-images/whmcs-php-fpm/**' + - 'whmcs-php-fpm/**' pull_request: paths: - - 'docker-images/whmcs-php-fpm/**' + - 'whmcs-php-fpm/**' jobs: build-and-push-docker-image: diff --git a/README.md b/README.md index 49291a5..3931d4b 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,6 @@ This project uses Nginx instead of Apache as a web server, WHMCS was developed w git clone https://github.com/EdyTheCow/docker-whmcs.git ``` -The directory `docker-images` can be removed/ignored unless you want to modify and build the docker image `php-fpm` yourself. This image is already pre-built by this repository and is being used in `whmcs/compose/docker-compose.yml`. - Set correct acme.json permissions
Navigate to `_base/data/traefik/` and run: ``` diff --git a/docker-images/whmcs-php-fpm/Dockerfile b/docker-images/whmcs-php-fpm/Dockerfile deleted file mode 100644 index 02f0b47..0000000 --- a/docker-images/whmcs-php-fpm/Dockerfile +++ /dev/null @@ -1,57 +0,0 @@ -FROM php:8.1-fpm -ENV DEBIAN_FRONTEND noninteractive - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - libzip-dev \ - zip \ - curl \ - libmemcached-dev \ - libz-dev \ - libpq-dev \ - libjpeg-dev \ - libpng-dev \ - libfreetype6-dev \ - libmcrypt-dev; \ - rm -rf /var/lib/apt/lists/* - -# Install additional PHP Packages and WHMCS Requirements -RUN docker-php-ext-configure zip && \ - docker-php-ext-install zip pdo_mysql mysqli - -RUN docker-php-ext-configure gd \ - --prefix=/usr \ - --with-jpeg \ - --with-webp \ - --with-freetype; \ - docker-php-ext-install gd; \ - php -r 'var_dump(gd_info());' - -RUN apt-get update -yqq && \ - apt-get install -y zlib1g-dev libicu-dev g++ && \ - docker-php-ext-configure intl && \ - docker-php-ext-install intl - -RUN rm /etc/apt/preferences.d/no-debian-php && \ - apt-get -y install libxml2-dev php-soap && \ - docker-php-ext-install soap; - -# Install the php ioncube loader (essential part to run WHMCS) -RUN cd /tmp \ - && curl -o ioncube.tar.gz https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \ - && tar zxpf ioncube.tar.gz \ - && mv ioncube/ioncube_loader_lin_8.1.so /usr/local/lib/php/extensions/* \ - && rm -Rf ioncube.tar.gz ioncube \ - && echo "zend_extension=ioncube_loader_lin_8.1.so" > /usr/local/etc/php/conf.d/docker-php-ext-ioncube_loader.ini \ - && rm -rf /tmp/ioncube* - -COPY ./whmcs.ini /usr/local/etc/php/conf.d -COPY ./xwhmcs.pool.conf /usr/local/etc/php-fpm.d/ - -USER root -RUN usermod -u 1000 www-data -WORKDIR /var/www - -CMD ["php-fpm"] -EXPOSE 9000 \ No newline at end of file diff --git a/docker-images/whmcs-php-fpm/whmcs.ini b/docker-images/whmcs-php-fpm/whmcs.ini deleted file mode 100644 index 4b27af9..0000000 --- a/docker-images/whmcs-php-fpm/whmcs.ini +++ /dev/null @@ -1,13 +0,0 @@ -date.timezone=UTC -display_errors=Off -log_errors=On - -memory_limit = 1024M -upload_max_filesize = 20M -post_max_size = 20M - -max_execution_time=600 -default_socket_timeout=3600 -request_terminate_timeout=600 - -opcache.enable=0 \ No newline at end of file diff --git a/docker-images/whmcs-php-fpm/xwhmcs.pool.conf b/docker-images/whmcs-php-fpm/xwhmcs.pool.conf deleted file mode 100644 index 096953a..0000000 --- a/docker-images/whmcs-php-fpm/xwhmcs.pool.conf +++ /dev/null @@ -1,11 +0,0 @@ -user = www-data -group = www-data -listen = 0.0.0.0:9000 - -pm = dynamic -pm.max_children = 20 -pm.start_servers = 2 -pm.min_spare_servers = 1 -pm.max_spare_servers = 3 - -catch_workers_output = yes