diff --git a/composer.json b/composer.json index cd97714..4f1d155 100644 --- a/composer.json +++ b/composer.json @@ -6,9 +6,9 @@ "license": "CC-BY-NC 4.0", "require": { "php": "^8.2", - "ext-gd": "^8.2", - "ext-mbstring": "^8.2", - "ext-zip": "^1.22", + "ext-gd": "*", + "ext-mbstring": "*", + "ext-zip": "*", "finnhub/client": "master@dev", "laravel/framework": "^11.35", "laravel/jetstream": "^5.1", diff --git a/docker/Dockerfile b/docker/Dockerfile index ff9a70c..efc72b0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,6 +6,29 @@ ENV DEBIAN_FRONTEND=noninteractive COPY . /var/www/app WORKDIR /var/www/app +# Set permissions +RUN chown -R www-data:www-data . \ + && chmod +x ./docker/entrypoint.sh \ +# Install common php extension dependencies + && apt-get update && apt-get install -y \ + nginx \ + libfreetype-dev \ + libjpeg62-turbo-dev \ + libpng-dev \ + zlib1g-dev \ + libzip-dev \ + libicu-dev \ + supervisor \ + && docker-php-ext-configure gd --with-freetype --with-jpeg \ + && docker-php-ext-install -j$(nproc) \ + gd \ + zip \ + pdo_mysql \ + mysqli \ + intl \ +# remove default nginx config + && rm /etc/nginx/sites-enabled/default + # Install Composer and Node.js RUN apt-get update && apt-get install -y \ curl \ @@ -21,30 +44,6 @@ RUN composer install --no-scripts --optimize-autoloader # Install Node dependencies and build assets RUN npm install && npm run build -# Set permissions -RUN chown -R www-data:www-data . \ - && chmod +x ./docker/entrypoint.sh \ -# Install common php extension dependencies - && apt-get update && apt-get install -y \ - nginx \ - libfreetype-dev \ - libjpeg62-turbo-dev \ - libpng-dev \ - zlib1g-dev \ - libzip-dev \ - libicu-dev \ - supervisor \ - && docker-php-ext-configure gd --with-freetype --with-jpeg \ - && docker-php-ext-configure zip \ - && docker-php-ext-install -j$(nproc) \ - gd \ - zip \ - pdo_mysql \ - mysqli \ - intl \ -# remove default nginx config - && rm /etc/nginx/sites-enabled/default - # Copy the custom Nginx configuration COPY ./docker/nginx.conf /etc/nginx/conf.d/default.conf