diff --git a/phpdocker/php-fpm/Dockerfile b/phpdocker/php-fpm/Dockerfile index c0470c5..ec5ae24 100644 --- a/phpdocker/php-fpm/Dockerfile +++ b/phpdocker/php-fpm/Dockerfile @@ -1,10 +1,6 @@ FROM phpdockerio/php:8.2-fpm WORKDIR "/application" -# ENV SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.2.29/supercronic-linux-amd64 \ -# SUPERCRONIC=supercronic-linux-amd64 \ -# SUPERCRONIC_SHA1SUM=cd48d45c4b10f3f0bfdd3a57d054cd05ac96812b - RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - RUN apt-get update && \ apt-get -y --no-install-recommends install \ @@ -14,24 +10,11 @@ RUN apt-get update && \ php8.2-sqlite3 \ php8.2-intl \ php8.2-pgsql \ + python3-pkg-resources supervisor ffmpeg jpegoptim \ php8.2-intl \ python3-pkg-resources supervisor \ nodejs && npm install -g npm@10.1.0 \ apt-get clean; \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* -# RUN curl -fsSLO "$SUPERCRONIC_URL" \ -# && echo "${SUPERCRONIC_SHA1SUM} ${SUPERCRONIC}" | sha1sum -c - \ -# && chmod +x "$SUPERCRONIC" \ -# && mv "$SUPERCRONIC" "/usr/local/bin/${SUPERCRONIC}" \ -# && ln -s "/usr/local/bin/${SUPERCRONIC}" /usr/local/bin/supercronic - - -RUN apt-get update && \ - apt-get install -y ffmpeg && \ - apt-get clean; \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* - ENV PATH=node_modules/.bin:$PATH - -# CMD ["supercronic", "/application/crontab"] diff --git a/phpdocker/worker/Dockerfile b/phpdocker/worker/Dockerfile index 59fe028..d1c30cf 100644 --- a/phpdocker/worker/Dockerfile +++ b/phpdocker/worker/Dockerfile @@ -3,7 +3,7 @@ WORKDIR "/application" RUN apt-get update && \ apt-get -y --no-install-recommends install git \ - php8.2-gd php8.2-mysql php8.2-sqlite3 php8.2-pgsql \ + php8.2-gd php8.2-mysql php8.2-sqlite3 php8.2-pgsql ffmpeg jpegoptim \ python3-pkg-resources supervisor && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*