Update docker files for open source

Dockerfile

@@ -16,11 +16,15 @@ ENV MIX_ENV=prod
 COPY mix.lock mix.lock
 COPY mix.exs  mix.exs
 COPY config config
+RUN rm config/prod.exs
+RUN mv config/prod-docker.exs config/prod.exs
 RUN mix deps.get --only $MIX_ENV
 RUN mix deps.compile
 
 # build assets
 COPY assets assets
+RUN rm assets/webpack.config.js
+RUN mv assets/webpack-docker.config.js assets/webpack.config.js
 RUN cd assets && yarn && yarn run deploy
 RUN mix phx.digest
 

README.md

@@ -21,11 +21,9 @@ Now you can visit [`localhost:4000`](http://localhost:4000) from your browser.
 ## Running with Docker
 
   * Clone the repo and `cd console`
-  * Follow instructions at the top of `/config/prod.exs`
-  * Follow instructions at the bottom of `/assets/webpack.config.js`
   * Update host at the top of `/config/releases.exs`
   * Sign up with Auth0 (https://auth0.com/)
-  * Create .env file in root folder
+  * Create .env and .env-router files in root folder
   * Populate .env file with the following
 
   ```

assets/webpack-docker.config.js

@@ -0,0 +1,53 @@
+const path = require('path');
+const webpack = require('webpack')
+const dotenv = require('dotenv').config( {
+  path: path.join(__dirname, '.env')
+} );
+
+module.exports = function(env) {
+  const production = process.env.NODE_ENV === 'production';
+  return {
+    devtool: production ? 'source-maps' : 'eval',
+    entry: './js/app.js',
+    output: {
+      path: path.resolve(__dirname, '../priv/static/js'),
+      filename: 'app.js',
+      publicPath: '/',
+    },
+    module: {
+      rules: [
+        {
+          test: /\.jsx?$/,
+          exclude: /node_modules/,
+          use: {
+            loader: 'babel-loader',
+          },
+        },
+        {
+          test: /\.css$/,
+          use: [ 'style-loader', 'css-loader' ]
+        },
+        {
+          test: /\.(png|svg|jpg|gif)$/,
+          use: [
+            {
+              loader: 'file-loader',
+              options: {
+                publicPath: '/js'
+              }
+            }
+          ]
+        },
+      ],
+    },
+    resolve: {
+      modules: ['node_modules', path.resolve(__dirname, 'js')],
+      extensions: ['.js', '.jsx'],
+    },
+    plugins: [
+      new webpack.DefinePlugin({
+        'process.env.SELF_HOSTED': true
+      })
+    ],
+  };
+};

assets/webpack.config.js

@@ -46,10 +46,6 @@ module.exports = function(env) {
     },
     plugins: [
       new webpack.EnvironmentPlugin(['AUTH_0_DOMAIN', 'AUTH_0_CLIENT_ID', 'ENV_DOMAIN', 'STRIPE_PUBLIC_KEY', 'SELF_HOSTED', 'INTERCOM_ID_SECRET', 'CONSOLE_VERSION', 'RELEASE_BLOG_LINK'])
-      // new webpack.DefinePlugin({
-      //   'process.env.SELF_HOSTED': true,
-      //   'process.env.ENV_DOMAIN': "localhost",
-      // }) // UNCOMMENT FOR OPEN SOURCE RUNNING AND COMMENT OUT ABOVE LINE
     ],
   };
 };

config/prod-docker.exs

@@ -0,0 +1 @@
+use Mix.Config

config/prod.exs

@@ -1,6 +1,5 @@
 use Mix.Config
 
-# COMMENT OUT EVERYTHING BELOW FOR OPEN SOURCE
 config :console, ConsoleWeb.Endpoint,
   load_from_system_env: true,
   url: [scheme: "https", host: System.get_env("HOSTNAME"), port: 443],