From 5c30d5fa8bb4c52c28068d081f1bdf7cb2bd5955 Mon Sep 17 00:00:00 2001
From: esikkala <esko.ikkala@aalto.fi>
Date: Thu, 16 Dec 2021 11:29:22 +0200
Subject: [PATCH] Add new build arg

---
 Dockerfile               | 5 +++--
 webpack.client.common.js | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7c7e7c99..e7e03383 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
 FROM node:16.13.0-alpine
 ARG API_URL
+ARG MAPBOX_ACCESS_TOKEN
 
 # Based on https://nodejs.org/en/docs/guides/nodejs-docker-webapp/
 
@@ -18,9 +19,9 @@ COPY babel.config.js ./
 # Bundle app source
 COPY src ./src
 
-# Run the scripts defined in package.json
+# Run the scripts defined in package.json using build arguments
 RUN npm install && \ 
-API_URL=$API_URL npm run build
+API_URL=$API_URL MAPBOX_ACCESS_TOKEN=$MAPBOX_ACCESS_TOKEN npm run build
 
 EXPOSE 3001
 
diff --git a/webpack.client.common.js b/webpack.client.common.js
index 5b0880a2..3f58fe09 100644
--- a/webpack.client.common.js
+++ b/webpack.client.common.js
@@ -1,11 +1,12 @@
 const path = require('path')
-const dotenv = require('dotenv').config()
+require('dotenv').config()
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const { CleanWebpackPlugin } = require('clean-webpack-plugin')
 const webpack = require('webpack')
 
 const outputDirectory = 'dist/public'
 const apiUrl = typeof process.env.API_URL !== 'undefined' ? process.env.API_URL : 'http://localhost:3001/api/v1'
+const mapboxAccessToken = typeof process.env.MAPBOX_ACCESS_TOKEN !== 'undefined' ? process.env.MAPBOX_ACCESS_TOKEN : 'MAPBOX_ACCESS_TOKEN missing'
 
 module.exports = {
   entry: {
@@ -29,7 +30,7 @@ module.exports = {
     }),
     new webpack.DefinePlugin({
       'process.env.API_URL': JSON.stringify(apiUrl),
-      'process.env': JSON.stringify(dotenv.parsed)
+      'process.env.MAPBOX_ACCESS_TOKEN': JSON.stringify(mapboxAccessToken)
     })
   ],
   output: {
-- 
GitLab