From 80352a86f055fe1b4f48c3cb76599213dab5bcf9 Mon Sep 17 00:00:00 2001
From: igoradamenko <mail@igoradamenko.com>
Date: Mon, 12 Feb 2018 22:08:19 +0200
Subject: [PATCH] add build-frontend part to dockerfile

---
 Dockerfile            | 11 +++++++++-
 web/webpack.config.js | 49 ++++++++++++++++++++++---------------------
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 19eb9084..e2689f13 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,10 +15,19 @@ RUN mkdir -p target && /script/coverage.sh
 RUN go build -o remark -ldflags "-X main.revision=$(git rev-parse --abbrev-ref HEAD)-$(git describe --abbrev=7 --always --tags)-$(date +%Y%m%d-%H:%M:%S) -s -w" ./app
 
 
+FROM node:9.4-alpine as build-frontend
+
+ADD webapp /srv/webapp
+RUN apk add --no-cache --update git python make g++
+RUN \
+    cd /srv/webapp && \
+    NODE_ENV=production npm i && npm run build
+
+
 FROM umputun/baseimage:micro-latest
 
 COPY --from=build-backend /go/src/github.com/umputun/remark/remark /srv/
-COPY --from=build-backend /go/src/github.com/umputun/remark/web /srv/web
+COPY --from=build-frontend /go/src/github.com/umputun/remark/web/public/ /srv/web
 RUN chown -R umputun:umputun /srv
 
 USER umputun
diff --git a/web/webpack.config.js b/web/webpack.config.js
index b2a48892..3b9e8a36 100644
--- a/web/webpack.config.js
+++ b/web/webpack.config.js
@@ -11,7 +11,7 @@ const Define = webpack.DefinePlugin;
 const { id } = require('./app/common/settings');
 const publicFolder = path.resolve(__dirname, 'public');
 const env = process.env.NODE_ENV || 'dev';
-const hash = env === 'production' ? '.[chunkhash]' : '.[hash]';
+const hash = env === 'production' ? '' : '.[hash]';
 
 module.exports = {
   context: __dirname,
@@ -47,29 +47,30 @@ module.exports = {
       },
       {
         test: /\.scss$/,
-        use: [
-          // TODO: style-loader must be turned on only for dev; for build we need extractCSS
-          'style-loader',
-          'css-loader',
-          {
-            loader: 'postcss-loader',
-            options: {
-              plugins: [
-                require('autoprefixer')({ browsers: ['> 1%'] }),
-                require('postcss-url')({ url: 'inline', maxSize: 5 }),
-                require('postcss-wrap')({ selector: `#${id}` }),
-                require('postcss-csso'),
-              ]
+        use: ExtractText.extract({
+          fallback: 'style-loader',
+          use: [
+            'css-loader',
+            {
+              loader: 'postcss-loader',
+              options: {
+                plugins: [
+                  require('autoprefixer')({ browsers: ['> 1%'] }),
+                  require('postcss-url')({ url: 'inline', maxSize: 5 }),
+                  require('postcss-wrap')({ selector: `#${id}` }),
+                  require('postcss-csso'),
+                ]
+              }
+            },
+            {
+              loader: 'sass-loader',
+              options: {
+                includePaths: [path.resolve(__dirname, 'app')],
+                // data: fs.readFileSync(path.resolve(__dirname, 'common/vars/vars.scss'), 'utf-8')
+              }
             }
-          },
-          {
-            loader: 'sass-loader',
-            options: {
-              includePaths: [path.resolve(__dirname, 'app')],
-              // data: fs.readFileSync(path.resolve(__dirname, 'common/vars/vars.scss'), 'utf-8')
-            }
-          }
-        ]
+          ]
+        }),
       },
       {
         test: /\.(png|jpg|jpeg|gif)$/,
@@ -95,7 +96,7 @@ module.exports = {
       filename: `app${hash}.css`,
       allChunks: true
     }),
-    // new webpack.optimize.UglifyJsPlugin(), // TODO: enable it
+    new webpack.optimize.UglifyJsPlugin(), // TODO: enable it
     new webpack.optimize.ModuleConcatenationPlugin(),
   ],
   watch: env === 'dev',