From 25992b19c0cd54e7e5f9b3a75ded6cb36f9eae32 Mon Sep 17 00:00:00 2001 From: Chris Kankiewicz Date: Mon, 13 Jan 2020 08:16:31 -0700 Subject: [PATCH] Fixed failing docker builds --- Dockerfile | 2 +- webpack.mix.js | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 223d16e..0b0a213 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ RUN composer install --working-dir /application --ignore-platform-reqs \ --no-cache --no-dev --no-interaction # Install and compile JavaScript assets -FROM node:13.2 AS js-dependencies +FROM node:13.6 AS js-dependencies COPY --from=php-dependencies /application /application RUN cd /application && npm install && npm run production diff --git a/webpack.mix.js b/webpack.mix.js index 14fc34f..734f5ef 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -2,6 +2,8 @@ let mix = require('laravel-mix'); let tailwindcss = require('tailwindcss'); require('laravel-mix-purgecss'); +mix.setPublicPath('.'); + mix.sass('app/resources/sass/app.scss', 'app/dist/app.css').options({ processCssUrls: false, postCss: [tailwindcss('tailwind.config.js')] @@ -21,6 +23,6 @@ mix.purgeCss({ whitelistPatterns: [/^fa\-/] }); -// if (mix.inProduction()) { -// mix.version(); -// } +if (mix.inProduction()) { + mix.version(); +}