diff --git a/Dockerfile b/Dockerfile index 993e174..ddb6f3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ FROM php:8.2-apache -LABEL maintainer='Jaivic' RUN a2enmod rewrite @@ -9,23 +8,32 @@ RUN apt-get update && apt-get install -y \ libzip-dev \ libxml2-dev \ libpq-dev \ - libpng-dev \ - nano \ - && docker-php-ext-install pdo pdo_pgsql pgsql zip bcmath gd intl soap opcache \ - && docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql + libpng-dev +RUN docker-php-ext-install \ + pdo \ + pdo_pgsql \ + pgsql \ + zip \ + bcmath \ + gd \ + intl \ + soap \ + opcache + +RUN docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql COPY --from=composer /usr/bin/composer /usr/bin/composer ENV COMPOSER_ALLOW_SUPERUSER 1 -COPY ./src/ /var/www/ddjj +COPY ./src/ /var/www/html COPY ./docker/000-default.conf /etc/apache2/sites-enabled/000-default.conf -WORKDIR /var/www/ddjj +WORKDIR /var/www/html -RUN chown -R www-data:www-data /var/www/ddjj \ +RUN chown -R www-data:www-data /var/www/html \ && composer install -RUN cd /var/www/ddjj/storage/ \ +RUN cd /var/www/html/storage/ \ && mkdir -p framework/sessions framework/views framework/cache/data \ && chmod -R 775 framework \ && chown -R www-data:www-data framework \ diff --git a/docker-compose-produccion.yml b/docker-compose-produccion.yml index 5a1f20c..ebaf24a 100644 --- a/docker-compose-produccion.yml +++ b/docker-compose-produccion.yml @@ -8,6 +8,7 @@ services: volumes: - /etc/localtime:/etc/localtime:ro depends_on: + - pgsql expose: # Usar ports en vez de expose en caso de necesitar acceder desde el host - 80 - 443 diff --git a/docker/000-default.conf b/docker/000-default.conf index e6e3735..ee869af 100644 --- a/docker/000-default.conf +++ b/docker/000-default.conf @@ -10,7 +10,7 @@ #ServerName www.example.com ServerAdmin webmaster@localhost - DocumentRoot /var/www/ddjj/public/ + DocumentRoot /var/www/html/public/ # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, # error, crit, alert, emerg.