diff --git a/Dockerfile b/Dockerfile index 44e770b..fe8b78e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,20 +5,19 @@ RUN composer install --working-dir /app --ignore-platform-reqs \ --no-cache --no-dev --no-interaction # Install and compile JavaScript assets -# FROM node:12.10 AS js-dependencies -# ARG FONT_AWESOME_TOKEN -# COPY --from=php-dependencies /app /app -# RUN cd /app && npm install && npm run production +FROM node:13.2 AS js-dependencies +COPY --from=php-dependencies /app /app +RUN cd /app && npm install && npm run production # Build application image -FROM php:7.3-apache as application -LABEL maintainer="Chris Kankiewicz " +FROM php:7.4-apache as application +LABEL maintainer="Chris Kankiewicz " -COPY --from=php-dependencies /app /var/www/html +COPY --from=js-dependencies /app /var/www/html RUN a2enmod rewrite -# Build (local) development image +# Build development image FROM application as development COPY ./.docker/php/config/php.dev.ini /usr/local/etc/php/php.ini COPY ./.docker/apache2/config/000-default.dev.conf /etc/apache2/sites-available/000-default.conf diff --git a/docker-compose.yaml b/docker-compose.yaml index d5c134a..945023f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -10,8 +10,6 @@ services: VIRTUAL_HOST: directorylister.local volumes: - ./:/var/www/html - # - ./.docker/php/config/php.dev.ini:/usr/local/etc/php/php.ini - # - ./.docker/apache2/config/000-default.dev.conf:/etc/apache2/sites-available/000-default.conf restart: unless-stopped networks: