From fa1bc382f94c34110457b703ad95d1d19019c307 Mon Sep 17 00:00:00 2001 From: Hugo Peixoto Date: Fri, 22 Dec 2023 19:40:10 +0000 Subject: [PATCH] Fix docker stuff --- Dockerfile | 5 +++-- freescout-entrypoint | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8d02812..39112b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,7 @@ FROM php:8.3.0-apache -VOLUME /var/www/html - RUN docker-php-ext-install mysqli +RUN docker-php-ext-install pdo_mysql RUN apt-get update && apt-get install -y libfreetype6-dev libjpeg62-turbo-dev libpng-dev libwebp-dev git libc-client-dev libkrb5-dev RUN docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp RUN docker-php-ext-install gd @@ -12,6 +11,7 @@ RUN a2enmod rewrite RUN a2enmod expires ADD freescout-dist /var/www/html +RUN chown -R www-data:www-data /var/www/html/ ADD apache2.conf /etc/apache2/sites-enabled/000-default.conf ADD freescout-entrypoint /usr/local/bin/ @@ -19,3 +19,4 @@ ADD freescout-entrypoint /usr/local/bin/ EXPOSE 80 ENTRYPOINT ["freescout-entrypoint"] +CMD ["apache2-foreground"] diff --git a/freescout-entrypoint b/freescout-entrypoint index 44abe88..96cfe20 100755 --- a/freescout-entrypoint +++ b/freescout-entrypoint @@ -5,4 +5,4 @@ php artisan freescout:clear-cache php artisan storage:link php artisan migrate -exec docker-php-entrypoint +exec docker-php-entrypoint "$@"