diff --git a/Dockers/remote-php-container/Dockerfile b/Dockers/remote-php-container/Dockerfile index d745980..90bccdc 100644 --- a/Dockers/remote-php-container/Dockerfile +++ b/Dockers/remote-php-container/Dockerfile @@ -1,9 +1,6 @@ # Use an official PHP runtime as a parent image FROM php:8.1-fpm -# CakePHP bin/cake uses this to skip probing; avoids edge cases with FPM images or CRLF-mangled scripts -ENV PHP=/usr/local/bin/php - # Set the working directory WORKDIR /workspace @@ -13,7 +10,7 @@ RUN apt-get update && apt-get install -y \ openssh-client \ unzip \ iputils-ping \ - dos2unix \ + default-mysql-client \ libpng-dev \ libjpeg-dev \ libfreetype6-dev \ @@ -27,7 +24,7 @@ RUN apt-get update && apt-get install -y \ cron \ sudo \ && docker-php-ext-configure gd --with-freetype --with-jpeg \ - && docker-php-ext-install gd mbstring zip pdo pdo_mysql pdo_pgsql pgsql intl + && docker-php-ext-install gd mbstring zip pdo pdo_mysql mysqli pdo_pgsql pgsql intl # Install Redis PHP extension via PECL RUN apt-get update && apt-get install -y --no-install-recommends $PHPIZE_DEPS libssl-dev \ @@ -74,7 +71,7 @@ RUN chmod +x /usr/local/bin/entrypoint.sh COPY crontab /etc/cron.d/laravel-cron RUN chmod 0644 /etc/cron.d/laravel-cron RUN crontab /etc/cron.d/laravel-cron -RUN dos2unix /usr/local/bin/entrypoint.sh + # Expose ports EXPOSE 8000 diff --git a/Dockers/remote-php-container/entrypoint.sh b/Dockers/remote-php-container/entrypoint.sh index ab8f32e..b2016ad 100644 --- a/Dockers/remote-php-container/entrypoint.sh +++ b/Dockers/remote-php-container/entrypoint.sh @@ -70,11 +70,6 @@ cd /workspace # Install PHP dependencies composer install -# CakePHP: CRLF in bin/cake (common after Windows checkouts) breaks the shell script and PHP_SAPI probing -if [ -f bin/cake ]; then - sed -i 's/\r$//' bin/cake -fi - # Copy the environment file to the repository's environments directory if [ -f /environment/.env ]; then cp /environment/.env /workspace/.env @@ -183,9 +178,5 @@ if [ -z "$START_COMMAND" ]; then START_COMMAND='php -S 0.0.0.0:8000' fi -if [ -f /workspace/bin/cake ]; then - sed -i 's/\r$//' /workspace/bin/cake -fi - # Always run the app under pm2-runtime exec pm2-runtime "$START_COMMAND"