From 5131ebb9c95a5e5a6805356d7e52fe3e967c61f8 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 18 Jul 2018 15:21:51 -0400
Subject: [PATCH] docker build updates

---
 .dockerignore | 2 +-
 Dockerfile    | 2 +-
 build.ps1     | 4 ++--
 build.sh      | 4 ++--
 package.json  | 1 +
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index a7af7afd295..702e015eef6 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,3 @@
 *
-!dist/*
+!build/*
 !entrypoint.sh
diff --git a/Dockerfile b/Dockerfile
index 429e81b413e..e8c8096bfea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update \
 ENV ASPNETCORE_URLS http://+:5000
 WORKDIR /app
 EXPOSE 5000
-COPY ./dist .
+COPY ./build .
 COPY entrypoint.sh /
 RUN chmod +x /entrypoint.sh
 
diff --git a/build.ps1 b/build.ps1
index 5bfd6feb2f9..148c9262ec7 100644
--- a/build.ps1
+++ b/build.ps1
@@ -4,9 +4,9 @@ echo "`n# Building Web"
 
 echo "`nBuilding app"
 echo "npm version $(npm --version)"
-echo "gulp version $(gulp --version)"
 npm install
-gulp dist:selfHosted
+npm run sub:update
+npm run dist:selfhost
 
 echo "`nBuilding docker image"
 docker --version
diff --git a/build.sh b/build.sh
index e37bbe74980..88a3c954b13 100644
--- a/build.sh
+++ b/build.sh
@@ -22,9 +22,9 @@ else
     echo ""
     echo "Building app"
     echo "npm version $(npm --version)"
-    echo "gulp version $(gulp --version)"
     npm install
-    gulp dist:selfHosted
+    npm run sub:update
+    npm run dist:selfhost
 
     echo ""
     echo "Building docker image"
diff --git a/package.json b/package.json
index 6b34992bc5a..a277419f1e2 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "build:selfhost:prod": "gulp build && cross-env SELF_HOST=true NODE_ENV=production webpack --config webpack.config.js",
     "build:selfhost:prod:watch": "gulp build && cross-env SELF_HOST=true NODE_ENV=production webpack-serve --config webpack.config.js",
     "dist": "npm run build:prod",
+    "dist:selfhost": "npm run build:selfhost:prod",
     "deploy": "npm run build:prod",
     "deploy:preview": "npm run dist && gh-pages -d build -r git@github.com:kspearrin/web-preview.git",
     "lint": "tslint src/**/*.ts || true",