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/README.md b/README.md index 900c1575..e1456c10 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 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" diff --git a/web/webpack.config.js b/web/webpack.config.js index 2b5bac0c..0354d75b 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'); @@ -31,7 +30,6 @@ const commonStyleLoaders = [ loader: 'sass-loader', options: { includePaths: [path.resolve(__dirname, 'app')], - // data: fs.readFileSync(path.resolve(__dirname, 'common/vars/vars.scss'), 'utf-8') } } ];