From 92726fb7a3d30470b60f157429a5ef04dc5c6c70 Mon Sep 17 00:00:00 2001
From: igoradamenko <mail@igoradamenko.com>
Date: Sun, 8 Apr 2018 14:22:24 +0300
Subject: [PATCH 1/5] remove useless code from webpack config

---
 web/webpack.config.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/webpack.config.js b/web/webpack.config.js
index 2b5bac0c..6f629d1e 100644
--- a/web/webpack.config.js
+++ b/web/webpack.config.js
@@ -1,4 +1,3 @@
-const fs = require('fs');
 const path = require('path');
 
 const webpack = require('webpack');
@@ -11,6 +10,7 @@ const Define = webpack.DefinePlugin;
 
 const { NODE_ID } = require('./app/common/constants');
 const publicFolder = path.resolve(__dirname, 'public');
+console.log(process)
 const env = process.env.NODE_ENV || 'dev';
 const url = process.env.REMARK_URL || 'https://demo.remark42.com';
 
@@ -31,7 +31,6 @@ const commonStyleLoaders = [
     loader: 'sass-loader',
     options: {
       includePaths: [path.resolve(__dirname, 'app')],
-      // data: fs.readFileSync(path.resolve(__dirname, 'common/vars/vars.scss'), 'utf-8')
     }
   }
 ];

From 89417aea826cabc536fd43ff9f0f1c065bc4f16d Mon Sep 17 00:00:00 2001
From: igoradamenko <mail@igoradamenko.com>
Date: Sun, 8 Apr 2018 14:29:46 +0300
Subject: [PATCH 2/5] remove compress from build

---
 web/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/package.json b/web/package.json
index fc6df2e9..8eefc46e 100644
--- a/web/package.json
+++ b/web/package.json
@@ -2,7 +2,7 @@
   "name": "remark-ui",
   "version": "0.1.0",
   "scripts": {
-    "build": "NODE_ENV=production webpack --config ./webpack.config.js",
+    "build": "webpack --config ./webpack.config.js",
     "start": "webpack-dev-server --progress --hot --inline --config ./webpack.config.js",
     "reinstall": "rm -rf ./node_modules/ && npm install"
   },

From 10df17b2c65923a2e1e2a546415dae9cfdc1030b Mon Sep 17 00:00:00 2001
From: igoradamenko <mail@igoradamenko.com>
Date: Sun, 8 Apr 2018 14:39:13 +0300
Subject: [PATCH 3/5] fix typo in readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dba2de6c..1c020b2a 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ Remark42 is a self-hosted, lightweight, and simple (yet functional) comment engi
 
 * copy provided `docker-compose.yml` and customize for your needs
 * make sure you **don't keep** `DEV=true` for any non-development deployments
-* pull prepared images from docker hub and start - `docker-compose pull && docker compose up -d`
+* pull prepared images from docker hub and start - `docker-compose pull && docker-compose up -d`
 * alternatively compile from sources - `docker-compose build`
 
 #### Parameters

From 6566bc74126f73ea2d3e75aa04ba6b7b9df24769 Mon Sep 17 00:00:00 2001
From: igoradamenko <mail@igoradamenko.com>
Date: Sun, 8 Apr 2018 14:53:24 +0300
Subject: [PATCH 4/5] get back build compress

---
 web/package.json      | 2 +-
 web/webpack.config.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/package.json b/web/package.json
index 8eefc46e..fc6df2e9 100644
--- a/web/package.json
+++ b/web/package.json
@@ -2,7 +2,7 @@
   "name": "remark-ui",
   "version": "0.1.0",
   "scripts": {
-    "build": "webpack --config ./webpack.config.js",
+    "build": "NODE_ENV=production webpack --config ./webpack.config.js",
     "start": "webpack-dev-server --progress --hot --inline --config ./webpack.config.js",
     "reinstall": "rm -rf ./node_modules/ && npm install"
   },
diff --git a/web/webpack.config.js b/web/webpack.config.js
index 6f629d1e..0354d75b 100644
--- a/web/webpack.config.js
+++ b/web/webpack.config.js
@@ -10,7 +10,6 @@ const Define = webpack.DefinePlugin;
 
 const { NODE_ID } = require('./app/common/constants');
 const publicFolder = path.resolve(__dirname, 'public');
-console.log(process)
 const env = process.env.NODE_ENV || 'dev';
 const url = process.env.REMARK_URL || 'https://demo.remark42.com';
 

From d9d1082f9e5e7664ebc1139e0f2a562ac7e3a973 Mon Sep 17 00:00:00 2001
From: igoradamenko <mail@igoradamenko.com>
Date: Sun, 8 Apr 2018 15:19:13 +0300
Subject: [PATCH 5/5] pass REMARK_URL as arg to frontend part during build time

---
 Dockerfile         | 3 +++
 docker-compose.yml | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 32e88e0c..6bbd7654 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,9 @@ RUN go build -o remark -ldflags "-X main.revision=$(git rev-parse --abbrev-ref H
 
 FROM node:9.4-alpine as build-frontend
 
+ARG REMARK_URL
+ENV REMARK_URL $REMARK_URL
+
 ADD web /srv/web
 RUN \
     cd /srv/web && \
diff --git a/docker-compose.yml b/docker-compose.yml
index 6b73e428..b1c983b5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,10 @@ version: '2'
 
 services:
     remark:
-        build: .
+        build:
+          context: .
+          args:
+            - REMARK_URL=${REMARK_URL}
         image: umputun/remark:master
         container_name: "remark"
         hostname: "remark"