From 9c729f2c8c8b889e788b3c7ddb3de1980152a158 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Sun, 26 Dec 2021 17:17:34 -0500
Subject: [PATCH] move docker scripts to src and update readme to reflect

---
 docker/Dockerfile         |  7 -------
 docker/docker-compose.yml | 12 ------------
 readme.md                 | 12 +++++-------
 src/dock/Dockerfile       | 11 +++++++++++
 src/dock/compose.yml      | 10 ++++++++++
 src/main/mesh.js          |  5 +++++
 6 files changed, 31 insertions(+), 26 deletions(-)
 delete mode 100644 docker/Dockerfile
 delete mode 100644 docker/docker-compose.yml
 create mode 100644 src/dock/Dockerfile
 create mode 100644 src/dock/compose.yml

diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index f0fa6035..00000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM node:15.14.0-stretch
-WORKDIR /app
-COPY ../ /app/
-EXPOSE 8080
-RUN npm i
-RUN npm install -g @gridspace/app-server
-CMD gs-app-server --debug
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
deleted file mode 100644
index 12ff4d9c..00000000
--- a/docker/docker-compose.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: '3.1'
-
-services:
-  kirimoto:
-    build:
-      context: .
-    ports:
-      - "8080:8080"
-
-
-
-
diff --git a/readme.md b/readme.md
index c42e8303..baf97c49 100644
--- a/readme.md
+++ b/readme.md
@@ -14,12 +14,11 @@ Contributions in all forms (code, bug reports, community engagement, localizatio
 ### Live Versions
 
 [![Website](https://img.shields.io/website?url=https%3A%2F%2Fgrid.space%2F)](https://grid.space/kiri/)
-![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/GridSpace/grid-apps/rel-2.1)
-![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/GridSpace/grid-apps/rel-2.2)
-![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/GridSpace/grid-apps/rel-2.3)
-![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/GridSpace/grid-apps/rel-2.4)
-![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/GridSpace/grid-apps/rel-2.5)
 ![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/GridSpace/grid-apps/rel-2.6)
+![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/GridSpace/grid-apps/rel-2.7)
+![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/GridSpace/grid-apps/rel-2.8)
+![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/GridSpace/grid-apps/rel-2.9)
+![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/GridSpace/grid-apps/rel-3.0)
 
 ### Development Activity
 
@@ -72,8 +71,7 @@ your path. You can either add it to your path, or you can run:
 ```
 git clone git@github.com:GridSpace/grid-apps.git
 cd grid-apps
-docker-compose build
-docker-compose up
+docker-compose -f src/dock/compose.yml up
 ```
 
 You can now access your environment of grid-apps by going to:
diff --git a/src/dock/Dockerfile b/src/dock/Dockerfile
new file mode 100644
index 00000000..fddf0fc4
--- /dev/null
+++ b/src/dock/Dockerfile
@@ -0,0 +1,11 @@
+FROM node:15.14.0-stretch
+WORKDIR /grid
+COPY package.json /grid
+COPY app.js /grid
+COPY apps /grid/apps
+COPY src /grid/src
+COPY web /grid/web
+EXPOSE 8080
+RUN npm i
+RUN npm install -g @gridspace/app-server
+CMD gs-app-server
diff --git a/src/dock/compose.yml b/src/dock/compose.yml
new file mode 100644
index 00000000..208fdb45
--- /dev/null
+++ b/src/dock/compose.yml
@@ -0,0 +1,10 @@
+version: '3.1'
+
+services:
+  kirimoto:
+    container_name: grid-apps
+    build:
+      context: ../..
+      dockerfile: src/dock/Dockerfile
+    ports:
+      - "8080:8080"
diff --git a/src/main/mesh.js b/src/main/mesh.js
index 2391a735..6ecfcb86 100644
--- a/src/main/mesh.js
+++ b/src/main/mesh.js
@@ -15,6 +15,7 @@ function init() {
         zoomspd = 1,
         Space = moto.Space;
 
+    // setup default workspace
     Space.showSkyGrid(sky);
     Space.setSkyColor(dark ? 0 : 0xffffff);
     Space.init(container, delta => { }, ortho);
@@ -26,7 +27,11 @@ function init() {
     Space.view.setZoom(zoomrev, zoomspd);
     Space.useDefaultKeys(true);
 
+    // hide loading curtain
     $('curtain').style.display = 'none';
+
+    // remove version cache bust from url
+    window.history.replaceState({},'','/mesh/');
 }
 
 document.onreadystatechange = function() {