wip

NIAEFEUP · Jul 17, 2024 · 3f104f6 · 3f104f6
1 parent 52fc4e1
commit 3f104f6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/dockerfiles/Dockerfile.seeder b/dockerfiles/Dockerfile.seeder
@@ -2,8 +2,7 @@
 FROM composer:2 AS migrate
 WORKDIR /app
 
-RUN apk add --no-cache php83-pdo_pgsql php83-pgsql php83-pecl-redis php83-iconv php83-zip
-COPY ./etc/php/php.ini ${PHP_INI_DIR}/conf.d/php.ini
+RUN install-php-extensions pdo_pgsql pgsql redis iconv zip
 
 COPY composer.json composer.lock artisan ./
 COPY app/ ./app/

diff --git a/dockerfiles/Dockerfile.website b/dockerfiles/Dockerfile.website
@@ -37,7 +37,7 @@ FROM trafex/php-nginx:3.4.0 AS deploy
 WORKDIR /var/www/html
 
 USER root
-RUN apk add --no-cache php82-pdo_pgsql php82-pgsql php82-pecl-redis php82-iconv php82-zip
+RUN install-php-extensions pdo_pgsql pgsql redis iconv zip
 
 ## Install supercronic (cron alternative)
 ENV SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.2.26/supercronic-linux-amd64 \
@@ -51,8 +51,6 @@ RUN curl -fsSLO "$SUPERCRONIC_URL" \
     && ln -s "/usr/local/bin/${SUPERCRONIC}" /usr/local/bin/supercronic
 
 COPY ./etc/nginx/default.conf /etc/nginx/conf.d/default.conf
-COPY ./etc/php/php.ini ${PHP_INI_DIR}/conf.d/php.ini
-COPY --chown=nobody ./etc/crontab ./crontab
 COPY --chown=nobody ./etc/supervisord.conf ./supervisord.conf
 RUN cat ./supervisord.conf >> /etc/supervisor/conf.d/supervisord.conf
 RUN rm ./supervisord.conf

diff --git a/etc/php/php.ini b/etc/php/php.ini