From eac8251191212a595b85e2fba7cbc2682e67d24d Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Thu, 2 Apr 2020 21:55:03 -0500
Subject: [PATCH 01/29] WIP- #1516 Add CI test to latest tag

---
 .github/workflows/release-build.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .github/workflows/release-build.yml

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
new file mode 100644
index 000000000..96c8a4bd0
--- /dev/null
+++ b/.github/workflows/release-build.yml
@@ -0,0 +1,24 @@
+name: Release Docker File Build
+
+on:
+  push:
+    branches:
+      - 1516-docker-release-action
+  release:
+    types: [published]
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+      - name: Checkout latest Tag
+      - run: git checkout $(git describe --tags)
+      - name: Use Node.js CI
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12
+      - run: npm install
+      - run: npm run test-unit

From 395a13f7f4cf650fceb161c79a47031f45a78fff Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Thu, 2 Apr 2020 22:00:50 -0500
Subject: [PATCH 02/29] WIP- checkout tag in CI step

---
 .github/workflows/release-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index 96c8a4bd0..14c0d3799 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -14,11 +14,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - name: Checkout latest Tag
-      - run: git checkout $(git describe --tags)
+
       - name: Use Node.js CI
         uses: actions/setup-node@v1
         with:
           node-version: 12
+      - run: git checkout $(git describe --tags)
       - run: npm install
       - run: npm run test-unit

From 37341008f30f78cf1b9e0adaa9803bfe2b3510f9 Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Thu, 2 Apr 2020 22:13:49 -0500
Subject: [PATCH 03/29] Add release tag

---
 .github/workflows/release-build.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index 14c0d3799..a29e1d84f 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -15,10 +15,16 @@ jobs:
       - uses: actions/checkout@v2
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
 
+      - name: Start MongoDB
+        uses: supercharge/mongodb-github-action@1.2.0
+        with:
+          - mongodb-version: 4.2
+
       - name: Use Node.js CI
         uses: actions/setup-node@v1
         with:
           node-version: 12
-      - run: git checkout $(git describe --tags)
+
+      - run: tag=$(git describe --tags `git rev-list --tags --max-count=1`) && git checkout $tag -b latest
       - run: npm install
       - run: npm run test-unit

From 1fe349076b0cfb03fa98a207967e9c0601d5f820 Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Thu, 2 Apr 2020 22:15:34 -0500
Subject: [PATCH 04/29] WIP- remove wrong - in action file

---
 .github/workflows/release-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index a29e1d84f..10509abac 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Start MongoDB
         uses: supercharge/mongodb-github-action@1.2.0
         with:
-          - mongodb-version: 4.2
+          mongodb-version: 4.2
 
       - name: Use Node.js CI
         uses: actions/setup-node@v1

From 12bd52881f544edc2c976be526c46c725fb90995 Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Fri, 3 Apr 2020 13:34:14 -0500
Subject: [PATCH 05/29] Add docker release action (demo)

---
 .github/workflows/release-build.yml | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index 10509abac..3dde8f7ad 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -14,17 +14,25 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+      - name: Checkout latest tag
+      - run: tag=$(git describe --tags `git rev-list --tags --max-count=1`) && git checkout $tag -b stable
+      - name: Publish to docker hub (Stable-Server)
+          uses: elgohr/Publish-Docker-Github-Action@master
+          with:
+            name: deepforge/server
+            username: ${{ secrets.DOCKER_USERNAME }}
+            password: ${{ secrets.DOCKER_PASSWORD }}
+            tags: "stable-demo"
 
-      - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@1.2.0
+      - name: Publish to docker hub (kitchen-sink-stable)
+        uses: elgohr/Publish-Docker-Github-Action@master
         with:
-          mongodb-version: 4.2
+          name: deepforge/kitchen-sink
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          tags: "stable-demo"
+          dockerfile: Dockerfile.kitchensink
 
-      - name: Use Node.js CI
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12
+      - name: Publish to npm (Demo)
+        run: npm publish --dry-run
 
-      - run: tag=$(git describe --tags `git rev-list --tags --max-count=1`) && git checkout $tag -b latest
-      - run: npm install
-      - run: npm run test-unit

From 0515a1a8be55642858943583f02fa013b551bb4f Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Fri, 3 Apr 2020 13:35:36 -0500
Subject: [PATCH 06/29] Fix indentation in workflow file

---
 .github/workflows/release-build.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index 3dde8f7ad..891ff6a46 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -17,12 +17,12 @@ jobs:
       - name: Checkout latest tag
       - run: tag=$(git describe --tags `git rev-list --tags --max-count=1`) && git checkout $tag -b stable
       - name: Publish to docker hub (Stable-Server)
-          uses: elgohr/Publish-Docker-Github-Action@master
-          with:
-            name: deepforge/server
-            username: ${{ secrets.DOCKER_USERNAME }}
-            password: ${{ secrets.DOCKER_PASSWORD }}
-            tags: "stable-demo"
+        uses: elgohr/Publish-Docker-Github-Action@master
+        with:
+          name: deepforge/server
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          tags: "stable-demo"
 
       - name: Publish to docker hub (kitchen-sink-stable)
         uses: elgohr/Publish-Docker-Github-Action@master

From 3f8633d41df2528a61cd3f1495c1993dbdcb5468 Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Fri, 3 Apr 2020 13:37:15 -0500
Subject: [PATCH 07/29] WIP-remove npm dry run

---
 .github/workflows/release-build.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index 891ff6a46..acf384867 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -14,7 +14,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - name: Checkout latest tag
       - run: tag=$(git describe --tags `git rev-list --tags --max-count=1`) && git checkout $tag -b stable
       - name: Publish to docker hub (Stable-Server)
         uses: elgohr/Publish-Docker-Github-Action@master
@@ -32,7 +31,3 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
           tags: "stable-demo"
           dockerfile: Dockerfile.kitchensink
-
-      - name: Publish to npm (Demo)
-        run: npm publish --dry-run
-

From 14f5a96ed9dbddffa5507d83ea9163903c4664de Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Fri, 3 Apr 2020 15:04:40 -0500
Subject: [PATCH 08/29] WIP- Add a demo release action

---
 .deployment/dev-entrypoint.sh                  |  2 +-
 .deployment/docker-compose-overrides.yml       |  2 +-
 .../docker-compose-stable-overrides.yml        | 18 ++++++++++++++++++
 .github/workflows/docker-build.yml             |  2 +-
 .github/workflows/release-build.yml            | 12 +++++++++++-
 5 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 .deployment/docker-compose-stable-overrides.yml

diff --git a/.deployment/dev-entrypoint.sh b/.deployment/dev-entrypoint.sh
index 3d918caa4..e425be5ca 100755
--- a/.deployment/dev-entrypoint.sh
+++ b/.deployment/dev-entrypoint.sh
@@ -4,4 +4,4 @@ source activate deepforge-server
 pip uninstall tensorflow -y
 conda install tensorflow==1.14 -y
 
-source activate ${DEEPFORGE_CONDA_ENV} && deepforge start --server
+source activate ${DEEPFORGE_CONDA_ENV} && deepforge start --server -p $1
diff --git a/.deployment/docker-compose-overrides.yml b/.deployment/docker-compose-overrides.yml
index bc1135499..10656de3c 100644
--- a/.deployment/docker-compose-overrides.yml
+++ b/.deployment/docker-compose-overrides.yml
@@ -1,3 +1,3 @@
 services:
   server:
-    entrypoint: /deepforge/.deployment/dev-entrypoint.sh
+    entrypoint: /deepforge/.deployment/dev-entrypoint.sh 8888
diff --git a/.deployment/docker-compose-stable-overrides.yml b/.deployment/docker-compose-stable-overrides.yml
new file mode 100644
index 000000000..b03a1ff55
--- /dev/null
+++ b/.deployment/docker-compose-stable-overrides.yml
@@ -0,0 +1,18 @@
+services:
+  server_stable:
+    entrypoint: /deepforge/.deployment/dev-entrypoint.sh 8889
+    environment:
+      - "MONGO_URI=mongodb://mongo:27017/deepforge_stable"
+      - "DEEPFORGE_HOST=https://editor.deepforge.org"
+      - "DEEPFORGE_PUBLIC_KEY=/token_keys/public_key"
+      - "DEEPFORGE_PRIVATE_KEY=/token_keys/private_key"
+    image: deepforge/kitchen-sink:stable-demo
+    ports:
+      - "8888:8888"
+    volumes:
+      - "$HOME/.deepforge/blob_stable:/data/blob"
+      - "${TOKEN_KEYS_DIR}:/token_keys"
+    depends_on:
+      - mongo
+
+
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index c18039a9e..0f3c29bf2 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -37,4 +37,4 @@ jobs:
           port: ${{ secrets.PORT }}
           passphrase: ${{ secrets.PASSPHRASE }}
           script: |
-            bash -ic deploy-deepforge
+            bash -ic deploy-deepforge latest
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index acf384867..d79d73db1 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -14,7 +14,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - run: tag=$(git describe --tags `git rev-list --tags --max-count=1`) && git checkout $tag -b stable
       - name: Publish to docker hub (Stable-Server)
         uses: elgohr/Publish-Docker-Github-Action@master
         with:
@@ -31,3 +30,14 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
           tags: "stable-demo"
           dockerfile: Dockerfile.kitchensink
+
+      - name: Deploy (editor.deepforge.org)
+        uses: appleboy/ssh-action@master
+        with:
+          username: ${{ secrets.USERNAME }}
+          host: ${{ secrets.HOST }}
+          key: ${{ secrets.KEY }}
+          port: ${{ secrets.PORT }}
+          passphrase: ${{ secrets.PASSPHRASE }}
+          script: |
+            bash -ic deploy-deepforge stable

From ffcc35691f0b96c925ad80c2a759015b4609db00 Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Fri, 3 Apr 2020 15:39:37 -0500
Subject: [PATCH 09/29] WIP- Change exposed port in
 custom-docker-compose-overrides

---
 .deployment/docker-compose-stable-overrides.yml | 2 +-
 .github/workflows/docker-build.yml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.deployment/docker-compose-stable-overrides.yml b/.deployment/docker-compose-stable-overrides.yml
index b03a1ff55..9285842ca 100644
--- a/.deployment/docker-compose-stable-overrides.yml
+++ b/.deployment/docker-compose-stable-overrides.yml
@@ -8,7 +8,7 @@ services:
       - "DEEPFORGE_PRIVATE_KEY=/token_keys/private_key"
     image: deepforge/kitchen-sink:stable-demo
     ports:
-      - "8888:8888"
+      - "8889:8889"
     volumes:
       - "$HOME/.deepforge/blob_stable:/data/blob"
       - "${TOKEN_KEYS_DIR}:/token_keys"
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 0f3c29bf2..c18039a9e 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -37,4 +37,4 @@ jobs:
           port: ${{ secrets.PORT }}
           passphrase: ${{ secrets.PASSPHRASE }}
           script: |
-            bash -ic deploy-deepforge latest
+            bash -ic deploy-deepforge

From f37ea3d95491d49e31f6e7b4014c9c0777fe5dc4 Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Fri, 3 Apr 2020 16:23:15 -0500
Subject: [PATCH 10/29] WIP- Switch to branch before docker build

---
 .deployment/README.md                           | 7 ++++---
 .deployment/docker-compose-stable-overrides.yml | 2 +-
 .github/workflows/release-build.yml             | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.deployment/README.md b/.deployment/README.md
index 073606fea..609b40cc6 100644
--- a/.deployment/README.md
+++ b/.deployment/README.md
@@ -1,11 +1,12 @@
 # Deployment Files
-This directory contains customizations to the standard deployment settings to accomodate the deployment machine.
+This directory contains customizations to the standard deployment settings to accommodate the deployment machine.
 
-Specifically, this contains a file with customizations to the standard docker-compose.yml file which allows us to modify the entrypoint and install a version of tensorflow [compatible with the CPU of the ddeployment machine](https://github.com/deepforge-dev/deepforge/issues/1561).
+Specifically, this contains a file with customizations to the standard docker-compose.yml file which allows us to modify the entrypoint and install a version of tensorflow [compatible with the CPU of the deployment machine](https://github.com/deepforge-dev/deepforge/issues/1561).
 
 The deployment is updated by first creating the custom docker compose file using [yaml-merge](https://github.com/alexlafroscia/yaml-merge):
 ```
-yaml-merge docker-compose.yml .deployment/docker-compose-overrides.yml > custom-docker-compose.yml
+yaml-merge docker-compose.yml .deployment/docker-compose-overrides.yml > custom-docker-compose.yml (for dev.deepforge.org)
+yaml-merge docker-compose.yml .deployment/docker-compose-stable-overrides.yml > custom-docker-compose.yml (for editor.deepforge.org)
 ```
 Next, the generated file can be used with docker-compose:
 ```
diff --git a/.deployment/docker-compose-stable-overrides.yml b/.deployment/docker-compose-stable-overrides.yml
index 9285842ca..f3473301d 100644
--- a/.deployment/docker-compose-stable-overrides.yml
+++ b/.deployment/docker-compose-stable-overrides.yml
@@ -2,7 +2,7 @@ services:
   server_stable:
     entrypoint: /deepforge/.deployment/dev-entrypoint.sh 8889
     environment:
-      - "MONGO_URI=mongodb://mongo:27017/deepforge_stable"
+      - "MONGO_URI=mongodb://mongo:27017/deepforge"
       - "DEEPFORGE_HOST=https://editor.deepforge.org"
       - "DEEPFORGE_PUBLIC_KEY=/token_keys/public_key"
       - "DEEPFORGE_PRIVATE_KEY=/token_keys/private_key"
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index d79d73db1..1d68969c1 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -14,6 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+      - run: git checkout -b 1516-docker-release-action origin/1516-docker-release-action
       - name: Publish to docker hub (Stable-Server)
         uses: elgohr/Publish-Docker-Github-Action@master
         with:

From 02272cc8c2a7ad14a513a3ecaa6b2e78e1aa30a4 Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Sat, 4 Apr 2020 14:32:07 -0500
Subject: [PATCH 11/29] WIP- Switch to branch before docker build

---
 .github/workflows/release-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index 1d68969c1..e7492086f 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - run: git checkout -b 1516-docker-release-action origin/1516-docker-release-action
+      - run: git checkout 1516-docker-release-action
       - name: Publish to docker hub (Stable-Server)
         uses: elgohr/Publish-Docker-Github-Action@master
         with:

From e1d2bd8f971dfe863fb6911a07502c32887aba40 Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Sat, 4 Apr 2020 14:58:08 -0500
Subject: [PATCH 12/29] WIP- Fix branch switching in kitchen-sink image

---
 .github/workflows/release-build.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index e7492086f..e84946809 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -23,6 +23,9 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
           tags: "stable-demo"
 
+      - uses: actions/checkout@v2
+      - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+      - run: git checkout 1516-docker-release-action
       - name: Publish to docker hub (kitchen-sink-stable)
         uses: elgohr/Publish-Docker-Github-Action@master
         with:

From 0e0044243cce2c17531342da31b4f304319a9141 Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Sat, 4 Apr 2020 16:27:17 -0500
Subject: [PATCH 13/29] WIP- Add Tag arguments

---
 .github/workflows/release-build.yml | 10 +++++-----
 Dockerfile.kitchensink              |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index e84946809..82c453fe4 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -23,17 +23,18 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
           tags: "stable-demo"
 
-      - uses: actions/checkout@v2
-      - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - run: git checkout 1516-docker-release-action
+
       - name: Publish to docker hub (kitchen-sink-stable)
         uses: elgohr/Publish-Docker-Github-Action@master
         with:
           name: deepforge/kitchen-sink
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
+          env:
+            TAG: stable-demo
           tags: "stable-demo"
           dockerfile: Dockerfile.kitchensink
+          buildargs: TAG
 
       - name: Deploy (editor.deepforge.org)
         uses: appleboy/ssh-action@master
@@ -43,5 +44,4 @@ jobs:
           key: ${{ secrets.KEY }}
           port: ${{ secrets.PORT }}
           passphrase: ${{ secrets.PASSPHRASE }}
-          script: |
-            bash -ic deploy-deepforge stable
+          script: deploy-deepforge stable
diff --git a/Dockerfile.kitchensink b/Dockerfile.kitchensink
index 003629492..00393e777 100644
--- a/Dockerfile.kitchensink
+++ b/Dockerfile.kitchensink
@@ -1,3 +1,3 @@
-FROM deepforge/server:latest
-
-RUN deepforge extensions add deepforge-dev/deepforge-keras && deepforge create-env -f
+ARG TAG=latest
+FROM deepforge/server:$TAG
+RUN echo $TAG

From 6b832aba27ce9f2eefa1b3967f43140932356eaa Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Sat, 4 Apr 2020 16:29:10 -0500
Subject: [PATCH 14/29] WIP- Add environment tag arguments as docker build

---
 .github/workflows/release-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index 82c453fe4..4ef16940e 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -26,12 +26,12 @@ jobs:
 
       - name: Publish to docker hub (kitchen-sink-stable)
         uses: elgohr/Publish-Docker-Github-Action@master
+        env:
+          TAG: stable-demo
         with:
           name: deepforge/kitchen-sink
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          env:
-            TAG: stable-demo
           tags: "stable-demo"
           dockerfile: Dockerfile.kitchensink
           buildargs: TAG

From 67326218b23f1d64b5d0095b1b5a075811be75bf Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Mon, 6 Apr 2020 18:12:20 -0500
Subject: [PATCH 15/29] WIP- Move compose customizations to a single file

---
 .deployment/deploy-deepforge                  |  7 ++++++-
 .deployment/docker-compose-overrides.yml      | 19 ++++++++++++++++++-
 .../docker-compose-stable-overrides.yml       | 18 ------------------
 .github/workflows/release-build.yml           |  7 +++++--
 4 files changed, 29 insertions(+), 22 deletions(-)
 delete mode 100644 .deployment/docker-compose-stable-overrides.yml

diff --git a/.deployment/deploy-deepforge b/.deployment/deploy-deepforge
index fcea585b9..1bae017dd 100755
--- a/.deployment/deploy-deepforge
+++ b/.deployment/deploy-deepforge
@@ -5,9 +5,14 @@ export DEEPFORGE_DEPLOYMENT_DIR
 . ~/.nvm/nvm.sh
 
 SERVER_NAME=server
+CUSTOM_OVERRIDE_FILE=docker-compose-overrides.yml
+
+if [[ $1 = "stable" ]]; then
+   SERVER_NAME="server_stable"
+fi;
 
 # Merging the custom override yml file
-yaml-merge docker-compose.yml "$DEEPFORGE_DEPLOYMENT_DIR"/docker-compose-overrides.yml > custom-docker-compose.yml
+yaml-merge docker-compose.yml "$DEEPFORGE_DEPLOYMENT_DIR"/$CUSTOM_OVERRIDE_FILE > custom-docker-compose.yml
 
 # Pulling the latest docker image, stopping the server, removing and restarting it
 docker-compose --file custom-docker-compose.yml pull $SERVER_NAME
diff --git a/.deployment/docker-compose-overrides.yml b/.deployment/docker-compose-overrides.yml
index 60a5514a3..1c02fb0e8 100644
--- a/.deployment/docker-compose-overrides.yml
+++ b/.deployment/docker-compose-overrides.yml
@@ -1,7 +1,24 @@
 services:
   server:
-    entrypoint: /.deployment/dev-entrypoint.sh
+    entrypoint: /.deployment/dev-entrypoint.sh 8888
     volumes:
       - "$HOME/.deepforge/blob:/data/blob"
       - "${TOKEN_KEYS_DIR}:/token_keys"
       - "${DEEPFORGE_DEPLOYMENT_DIR}:/.deployment"
+
+  server_stable:
+    entrypoint: /deepforge/.deployment/dev-entrypoint.sh 8889
+    environment:
+      - "MONGO_URI=mongodb://mongo:27017/deepforge"
+      - "DEEPFORGE_HOST=https://editor.deepforge.org"
+      - "DEEPFORGE_PUBLIC_KEY=/token_keys/public_key"
+      - "DEEPFORGE_PRIVATE_KEY=/token_keys/private_key"
+    image: deepforge/kitchen-sink:stable-demo
+    ports:
+      - "8889:8889"
+    volumes:
+      - "$HOME/.deepforge/blob:/data/blob"
+      - "${TOKEN_KEYS_DIR}:/token_keys"
+      - "${DEEPFORGE_DEPLOYMENT_DIR}:/.deployment"
+    depends_on:
+      - mongo
diff --git a/.deployment/docker-compose-stable-overrides.yml b/.deployment/docker-compose-stable-overrides.yml
deleted file mode 100644
index f3473301d..000000000
--- a/.deployment/docker-compose-stable-overrides.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-services:
-  server_stable:
-    entrypoint: /deepforge/.deployment/dev-entrypoint.sh 8889
-    environment:
-      - "MONGO_URI=mongodb://mongo:27017/deepforge"
-      - "DEEPFORGE_HOST=https://editor.deepforge.org"
-      - "DEEPFORGE_PUBLIC_KEY=/token_keys/public_key"
-      - "DEEPFORGE_PRIVATE_KEY=/token_keys/private_key"
-    image: deepforge/kitchen-sink:stable-demo
-    ports:
-      - "8889:8889"
-    volumes:
-      - "$HOME/.deepforge/blob_stable:/data/blob"
-      - "${TOKEN_KEYS_DIR}:/token_keys"
-    depends_on:
-      - mongo
-
-
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index 4ef16940e..d1861e340 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -36,7 +36,7 @@ jobs:
           dockerfile: Dockerfile.kitchensink
           buildargs: TAG
 
-      - name: Deploy (editor.deepforge.org)
+      - name: Deploy (dev.deepforge.org)
         uses: appleboy/ssh-action@master
         with:
           username: ${{ secrets.USERNAME }}
@@ -44,4 +44,7 @@ jobs:
           key: ${{ secrets.KEY }}
           port: ${{ secrets.PORT }}
           passphrase: ${{ secrets.PASSPHRASE }}
-          script: deploy-deepforge stable
+          script: |
+            rm -rf deepforge-stable && git clone git@github.com:deepforge-dev/deepforge deepforge-stable && cd deepforge-stable
+            git checkout -b 1516-docker-release-action
+            chmod +x ./.deployment/deploy-deepforge && ./.deployment/deploy-deepforge stable

From f2e710868e785c0841d7467e15f55ef92d9392a2 Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Mon, 6 Apr 2020 18:26:58 -0500
Subject: [PATCH 16/29] WIP- fix branch checkout

---
 .github/workflows/release-build.yml | 48 ++++++++++++++---------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index d1861e340..366d64abe 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -12,29 +12,29 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - run: git checkout 1516-docker-release-action
-      - name: Publish to docker hub (Stable-Server)
-        uses: elgohr/Publish-Docker-Github-Action@master
-        with:
-          name: deepforge/server
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          tags: "stable-demo"
-
-
-      - name: Publish to docker hub (kitchen-sink-stable)
-        uses: elgohr/Publish-Docker-Github-Action@master
-        env:
-          TAG: stable-demo
-        with:
-          name: deepforge/kitchen-sink
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          tags: "stable-demo"
-          dockerfile: Dockerfile.kitchensink
-          buildargs: TAG
+#      - uses: actions/checkout@v2
+#      - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+#      - run: git checkout 1516-docker-release-action
+#      - name: Publish to docker hub (Stable-Server)
+#        uses: elgohr/Publish-Docker-Github-Action@master
+#        with:
+#          name: deepforge/server
+#          username: ${{ secrets.DOCKER_USERNAME }}
+#          password: ${{ secrets.DOCKER_PASSWORD }}
+#          tags: "stable-demo"
+#
+#
+#      - name: Publish to docker hub (kitchen-sink-stable)
+#        uses: elgohr/Publish-Docker-Github-Action@master
+#        env:
+#          TAG: stable-demo
+#        with:
+#          name: deepforge/kitchen-sink
+#          username: ${{ secrets.DOCKER_USERNAME }}
+#          password: ${{ secrets.DOCKER_PASSWORD }}
+#          tags: "stable-demo"
+#          dockerfile: Dockerfile.kitchensink
+#          buildargs: TAG
 
       - name: Deploy (dev.deepforge.org)
         uses: appleboy/ssh-action@master
@@ -46,5 +46,5 @@ jobs:
           passphrase: ${{ secrets.PASSPHRASE }}
           script: |
             rm -rf deepforge-stable && git clone git@github.com:deepforge-dev/deepforge deepforge-stable && cd deepforge-stable
-            git checkout -b 1516-docker-release-action
+            git checkout -b 1516-docker-release-action origin/1516-docker-release-action
             chmod +x ./.deployment/deploy-deepforge && ./.deployment/deploy-deepforge stable

From d0006b002dfacad19a9b13f9991fd8d4ec04f5d8 Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Mon, 6 Apr 2020 19:12:07 -0500
Subject: [PATCH 17/29] WIP- Fix docker-compose command with a uniform project
 name across directories

---
 .deployment/README.md               |  3 +-
 .deployment/deploy-deepforge        | 13 ++++----
 .github/workflows/release-build.yml | 48 ++++++++++++++---------------
 3 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/.deployment/README.md b/.deployment/README.md
index c6cab09d0..59240c819 100644
--- a/.deployment/README.md
+++ b/.deployment/README.md
@@ -7,8 +7,7 @@ Additionally, this contains a file with customizations to the standard docker-co
 
 The deployment is updated by first creating the custom docker compose file using [yaml-merge](https://github.com/alexlafroscia/yaml-merge):
 ```
-yaml-merge docker-compose.yml .deployment/docker-compose-overrides.yml > custom-docker-compose.yml (for dev.deepforge.org)
-yaml-merge docker-compose.yml .deployment/docker-compose-stable-overrides.yml > custom-docker-compose.yml (for editor.deepforge.org)
+yaml-merge docker-compose.yml .deployment/docker-compose-overrides.yml > custom-docker-compose.yml
 ```
 Next, the generated file can be used with docker-compose:
 ```
diff --git a/.deployment/deploy-deepforge b/.deployment/deploy-deepforge
index 1bae017dd..69c15d221 100755
--- a/.deployment/deploy-deepforge
+++ b/.deployment/deploy-deepforge
@@ -4,20 +4,19 @@ export DEEPFORGE_DEPLOYMENT_DIR
 
 . ~/.nvm/nvm.sh
 
-SERVER_NAME=server
-CUSTOM_OVERRIDE_FILE=docker-compose-overrides.yml
+SERVER_NAME="server"
 
 if [[ $1 = "stable" ]]; then
    SERVER_NAME="server_stable"
 fi;
 
 # Merging the custom override yml file
-yaml-merge docker-compose.yml "$DEEPFORGE_DEPLOYMENT_DIR"/$CUSTOM_OVERRIDE_FILE > custom-docker-compose.yml
+yaml-merge docker-compose.yml "$DEEPFORGE_DEPLOYMENT_DIR"/docker-compose-overirdes.yml > custom-docker-compose.yml
 
 # Pulling the latest docker image, stopping the server, removing and restarting it
-docker-compose --file custom-docker-compose.yml pull $SERVER_NAME
-docker-compose stop $SERVER_NAME
-docker-compose rm -f $SERVER_NAME
-docker-compose --file custom-docker-compose.yml up -d $SERVER_NAME
+docker-compose --file custom-docker-compose.yml -p deepforge pull $SERVER_NAME
+docker-compose -p deepforge stop $SERVER_NAME
+docker-compose -p deepforge rm -f $SERVER_NAME
+docker-compose --file custom-docker-compose.yml -p deepforge up -d $SERVER_NAME
 
 docker image prune -f
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index 366d64abe..903a66632 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -12,31 +12,31 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-#      - uses: actions/checkout@v2
-#      - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-#      - run: git checkout 1516-docker-release-action
-#      - name: Publish to docker hub (Stable-Server)
-#        uses: elgohr/Publish-Docker-Github-Action@master
-#        with:
-#          name: deepforge/server
-#          username: ${{ secrets.DOCKER_USERNAME }}
-#          password: ${{ secrets.DOCKER_PASSWORD }}
-#          tags: "stable-demo"
-#
-#
-#      - name: Publish to docker hub (kitchen-sink-stable)
-#        uses: elgohr/Publish-Docker-Github-Action@master
-#        env:
-#          TAG: stable-demo
-#        with:
-#          name: deepforge/kitchen-sink
-#          username: ${{ secrets.DOCKER_USERNAME }}
-#          password: ${{ secrets.DOCKER_PASSWORD }}
-#          tags: "stable-demo"
-#          dockerfile: Dockerfile.kitchensink
-#          buildargs: TAG
+      - uses: actions/checkout@v2
+      - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+      - run: git checkout 1516-docker-release-action
+      - name: Publish to docker hub (Stable-Server)
+        uses: elgohr/Publish-Docker-Github-Action@master
+        with:
+          name: deepforge/server
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          tags: "stable-demo"
+
+
+      - name: Publish to docker hub (kitchen-sink-stable)
+        uses: elgohr/Publish-Docker-Github-Action@master
+        env:
+          TAG: stable-demo
+        with:
+          name: deepforge/kitchen-sink
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          tags: "stable-demo"
+          dockerfile: Dockerfile.kitchensink
+          buildargs: TAG
 
-      - name: Deploy (dev.deepforge.org)
+      - name: Deploy (editor.deepforge.org)
         uses: appleboy/ssh-action@master
         with:
           username: ${{ secrets.USERNAME }}

From 15d27eb91adbf52fdf3ef50b7f7d85966aaa0783 Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Mon, 6 Apr 2020 19:34:08 -0500
Subject: [PATCH 18/29] WIP- Fix typo in custom overrides file

---
 .deployment/deploy-deepforge | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.deployment/deploy-deepforge b/.deployment/deploy-deepforge
index 69c15d221..ba6c5c54f 100755
--- a/.deployment/deploy-deepforge
+++ b/.deployment/deploy-deepforge
@@ -11,7 +11,7 @@ if [[ $1 = "stable" ]]; then
 fi;
 
 # Merging the custom override yml file
-yaml-merge docker-compose.yml "$DEEPFORGE_DEPLOYMENT_DIR"/docker-compose-overirdes.yml > custom-docker-compose.yml
+yaml-merge docker-compose.yml "$DEEPFORGE_DEPLOYMENT_DIR"/docker-compose-overrides.yml > custom-docker-compose.yml
 
 # Pulling the latest docker image, stopping the server, removing and restarting it
 docker-compose --file custom-docker-compose.yml -p deepforge pull $SERVER_NAME

From 96f26ac052cacaf9e4ac0068fc9e69db7bed76cb Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Mon, 6 Apr 2020 19:48:56 -0500
Subject: [PATCH 19/29] WIP- add correct mount path for the deployment script

---
 .deployment/docker-compose-overrides.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.deployment/docker-compose-overrides.yml b/.deployment/docker-compose-overrides.yml
index 1c02fb0e8..25399e5b2 100644
--- a/.deployment/docker-compose-overrides.yml
+++ b/.deployment/docker-compose-overrides.yml
@@ -7,7 +7,7 @@ services:
       - "${DEEPFORGE_DEPLOYMENT_DIR}:/.deployment"
 
   server_stable:
-    entrypoint: /deepforge/.deployment/dev-entrypoint.sh 8889
+    entrypoint: /.deployment/dev-entrypoint.sh 8889
     environment:
       - "MONGO_URI=mongodb://mongo:27017/deepforge"
       - "DEEPFORGE_HOST=https://editor.deepforge.org"

From 1a97941993461d2806fdf1558e15f50747001cd4 Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Tue, 7 Apr 2020 13:32:24 -0500
Subject: [PATCH 20/29] WIP- Consolidate action to a single workflow file

---
 .github/workflows/docker-build.yml  | 40 +++++++++++++++++++++--
 .github/workflows/release-build.yml | 50 -----------------------------
 2 files changed, 38 insertions(+), 52 deletions(-)
 delete mode 100644 .github/workflows/release-build.yml

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 88abaa645..e32be2741 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -4,6 +4,10 @@ on:
   push:
     branches:
       - master
+      - 1516-docker-release-action
+  release:
+    types:
+      - published
 
 jobs:
   publish:
@@ -11,22 +15,40 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+
+      - name: Get Release Tags
+        id: get_version
+        run: |
+          echo "::set-env name=RELEASE_TAG_NAME::$(echo ${GITHUB_REF:10})"
+          echo "::set-env name=DEFAULT_TAG_NAME::stable"
+        if: github.event_name == 'release'
+
+      - name: Get Push Tags
+        id: get_release_tags
+        run: |
+          echo "::set-env name=DEFAULT_TAG_NAME::latest"
+          echo "::set-env name=RELEASE_TAG_NAME::$(echo ${GITHUB_REF:11})"
+        if: github.event_name == 'push'
+
       - name: Publish to docker hub (server)
         uses: elgohr/Publish-Docker-Github-Action@master
         with:
           name: deepforge/server
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          tags: "latest"
+          tags: "${{ env.DEFAULT_TAG_NAME }},${{ env.RELEASE_TAG_NAME }}"
 
       - name: Publish to docker hub (kitchen-sink)
         uses: elgohr/Publish-Docker-Github-Action@master
+
         with:
           name: deepforge/kitchen-sink
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          tags: "latest"
+          tags: "${{ env.DEFAULT_TAG_NAME }},${{ env.RELEASE_TAG_NAME }}"
           dockerfile: Dockerfile.kitchensink
+          buildargs: "${{ env.DEFAULT_TAG_NAME }}"
+
 
       - name: Deploy (dev.deepforge.org)
         uses: appleboy/ssh-action@master
@@ -39,3 +61,17 @@ jobs:
           script: |
             rm -rf deepforge && git clone git@github.com:deepforge-dev/deepforge && cd deepforge
             chmod +x ./.deployment/deploy-deepforge && ./.deployment/deploy-deepforge
+        if: github.event_name == 'push'
+
+      - name: Deploy (editor.deepforge.org)
+        uses: appleboy/ssh-action@master
+        with:
+          username: ${{ secrets.USERNAME }}
+          host: ${{ secrets.HOST }}
+          key: ${{ secrets.KEY }}
+          port: ${{ secrets.PORT }}
+          passphrase: ${{ secrets.PASSPHRASE }}
+          script: |
+            rm -rf deepforge-stable && git clone git@github.com:deepforge-dev/deepforge-stable && cd deepforge-stable
+            chmod +x ./.deployment/deploy-deepforge && ./.deployment/deploy-deepforge stable
+        if: github.event_name == 'release'
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
deleted file mode 100644
index 903a66632..000000000
--- a/.github/workflows/release-build.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Release Docker File Build
-
-on:
-  push:
-    branches:
-      - 1516-docker-release-action
-  release:
-    types: [published]
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - run: git checkout 1516-docker-release-action
-      - name: Publish to docker hub (Stable-Server)
-        uses: elgohr/Publish-Docker-Github-Action@master
-        with:
-          name: deepforge/server
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          tags: "stable-demo"
-
-
-      - name: Publish to docker hub (kitchen-sink-stable)
-        uses: elgohr/Publish-Docker-Github-Action@master
-        env:
-          TAG: stable-demo
-        with:
-          name: deepforge/kitchen-sink
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          tags: "stable-demo"
-          dockerfile: Dockerfile.kitchensink
-          buildargs: TAG
-
-      - name: Deploy (editor.deepforge.org)
-        uses: appleboy/ssh-action@master
-        with:
-          username: ${{ secrets.USERNAME }}
-          host: ${{ secrets.HOST }}
-          key: ${{ secrets.KEY }}
-          port: ${{ secrets.PORT }}
-          passphrase: ${{ secrets.PASSPHRASE }}
-          script: |
-            rm -rf deepforge-stable && git clone git@github.com:deepforge-dev/deepforge deepforge-stable && cd deepforge-stable
-            git checkout -b 1516-docker-release-action origin/1516-docker-release-action
-            chmod +x ./.deployment/deploy-deepforge && ./.deployment/deploy-deepforge stable

From a74cee346c72f384f0a3ff4f085c1fbf202c6b8d Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Tue, 7 Apr 2020 13:48:33 -0500
Subject: [PATCH 21/29] WIP- Rename TAG environment variables in action files

---
 .github/workflows/docker-build.yml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index e32be2741..4d5658338 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -19,15 +19,17 @@ jobs:
       - name: Get Release Tags
         id: get_version
         run: |
-          echo "::set-env name=RELEASE_TAG_NAME::$(echo ${GITHUB_REF:10})"
-          echo "::set-env name=DEFAULT_TAG_NAME::stable"
+          echo "::set-env name=RELEASE_TAG::$(echo ${GITHUB_REF:10})"
+          echo "::set-env name=TAG::stable"
+          echo "::set-env name=TAG_SEMVER::true"
         if: github.event_name == 'release'
 
       - name: Get Push Tags
         id: get_release_tags
         run: |
-          echo "::set-env name=DEFAULT_TAG_NAME::latest"
-          echo "::set-env name=RELEASE_TAG_NAME::$(echo ${GITHUB_REF:11})"
+          echo "::set-env name=TAG::latest"
+          echo "::set-env name=RELEASE_TAG::$(echo ${GITHUB_REF:11})"
+          echo "::set-env name=TAG_SEMVER::false"
         if: github.event_name == 'push'
 
       - name: Publish to docker hub (server)
@@ -36,7 +38,8 @@ jobs:
           name: deepforge/server
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          tags: "${{ env.DEFAULT_TAG_NAME }},${{ env.RELEASE_TAG_NAME }}"
+          tags: "${{ env.TAG }},${{ env.RELEASE_TAG }}"
+          tag_semver: "${{ env.TAG_SEMVER }}"
 
       - name: Publish to docker hub (kitchen-sink)
         uses: elgohr/Publish-Docker-Github-Action@master
@@ -45,9 +48,10 @@ jobs:
           name: deepforge/kitchen-sink
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          tags: "${{ env.DEFAULT_TAG_NAME }},${{ env.RELEASE_TAG_NAME }}"
+          tags: "${{ env.TAG }},${{ env.RELEASE_TAG }}"
           dockerfile: Dockerfile.kitchensink
-          buildargs: "${{ env.DEFAULT_TAG_NAME }}"
+          buildargs: "${{ env.TAG }}"
+          tag_semver: "${{ env.TAG_SEMVER }}"
 
 
       - name: Deploy (dev.deepforge.org)

From 6e7dda9f42f4365456a6bec5a0b86ea87451a062 Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Tue, 7 Apr 2020 14:17:44 -0500
Subject: [PATCH 22/29] WIP- remove branch ref and change images in the
 overrides file

---
 .deployment/docker-compose-overrides.yml | 2 +-
 .github/workflows/docker-build.yml       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.deployment/docker-compose-overrides.yml b/.deployment/docker-compose-overrides.yml
index 25399e5b2..af8065e35 100644
--- a/.deployment/docker-compose-overrides.yml
+++ b/.deployment/docker-compose-overrides.yml
@@ -13,7 +13,7 @@ services:
       - "DEEPFORGE_HOST=https://editor.deepforge.org"
       - "DEEPFORGE_PUBLIC_KEY=/token_keys/public_key"
       - "DEEPFORGE_PRIVATE_KEY=/token_keys/private_key"
-    image: deepforge/kitchen-sink:stable-demo
+    image: deepforge/kitchen-sink:stable
     ports:
       - "8889:8889"
     volumes:
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 4d5658338..787cb79a5 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-      - 1516-docker-release-action
   release:
     types:
       - published
@@ -17,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Get Release Tags
-        id: get_version
+        id: get_release_tags
         run: |
           echo "::set-env name=RELEASE_TAG::$(echo ${GITHUB_REF:10})"
           echo "::set-env name=TAG::stable"
@@ -25,7 +24,7 @@ jobs:
         if: github.event_name == 'release'
 
       - name: Get Push Tags
-        id: get_release_tags
+        id: get_push_tags
         run: |
           echo "::set-env name=TAG::latest"
           echo "::set-env name=RELEASE_TAG::$(echo ${GITHUB_REF:11})"
@@ -77,5 +76,6 @@ jobs:
           passphrase: ${{ secrets.PASSPHRASE }}
           script: |
             rm -rf deepforge-stable && git clone git@github.com:deepforge-dev/deepforge-stable && cd deepforge-stable
+            git checkout -b stable $(git tag | tail -1)
             chmod +x ./.deployment/deploy-deepforge && ./.deployment/deploy-deepforge stable
         if: github.event_name == 'release'

From 0f821a439359d42b6970abc1d4ed91968247dd0f Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Tue, 7 Apr 2020 14:19:57 -0500
Subject: [PATCH 23/29] WIP- Fix kitchensink file

---
 Dockerfile.kitchensink | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile.kitchensink b/Dockerfile.kitchensink
index 00393e777..f80881ead 100644
--- a/Dockerfile.kitchensink
+++ b/Dockerfile.kitchensink
@@ -1,3 +1,4 @@
 ARG TAG=latest
 FROM deepforge/server:$TAG
-RUN echo $TAG
+
+RUN deepforge extensions add deepforge-dev/deepforge-keras && deepforge create-env -f

From 528fa764011580ab5bc50b6ed01e0da276305c86 Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Tue, 7 Apr 2020 16:36:37 -0500
Subject: [PATCH 24/29] WIP- Add project name for multidirectory consistency

---
 .deployment/deploy-deepforge | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.deployment/deploy-deepforge b/.deployment/deploy-deepforge
index 3b0135eeb..9ade67647 100755
--- a/.deployment/deploy-deepforge
+++ b/.deployment/deploy-deepforge
@@ -14,9 +14,9 @@ fi;
 yaml-merge docker/docker-compose.yml "$DEEPFORGE_DEPLOYMENT_DIR"/docker-compose-overrides.yml > custom-docker-compose.yml
 
 # Pulling the latest docker image, stopping the server, removing and restarting it
-docker-compose --file custom-docker-compose.yml pull $SERVER_NAME
-docker-compose --file custom-docker-compose.yml stop $SERVER_NAME
-docker-compose --file custom-docker-compose.yml rm -f $SERVER_NAME
-docker-compose --file custom-docker-compose.yml up -d $SERVER_NAME
+docker-compose --file custom-docker-compose.yml -p deepforge pull $SERVER_NAME
+docker-compose --file custom-docker-compose.yml -p deepforge stop $SERVER_NAME
+docker-compose --file custom-docker-compose.yml -p deepforge rm -f $SERVER_NAME
+docker-compose --file custom-docker-compose.yml -p deepforge up -d $SERVER_NAME
 
 docker image prune -f

From 78ed42095db10b765f3ed5bb099234235e2e734b Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Tue, 7 Apr 2020 17:32:16 -0500
Subject: [PATCH 25/29] Manually set semver tags for release

---
 .github/workflows/docker-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 202565f19..e7d2c05f5 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Get Release Tags
         id: get_release_tags
         run: |
-          echo "::set-env name=RELEASE_TAG::$(echo ${GITHUB_REF:10})"
+          echo "::set-env name=RELEASE_TAG_NAME::$(echo ${GITHUB_REF} | sed -e "s/refs\/tags\///g" | sed -E "s/v?([0-9]+)\.([0-9+])\.([0-9]+)(-[a-zA-Z]+(\.[0-9]+)?)?/\1.\2.\3\4, \1.\2\4, \1\4/g")"
           echo "::set-env name=TAG::stable"
           echo "::set-env name=TAG_SEMVER::true"
         if: github.event_name == 'release'

From 7f3e8c77e9260424002c11f0a929f6c622f8b76e Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Tue, 7 Apr 2020 17:36:10 -0500
Subject: [PATCH 26/29] WIP- remove tag_semver from github action

---
 .github/workflows/docker-build.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index e7d2c05f5..f9b391c7f 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -20,7 +20,6 @@ jobs:
         run: |
           echo "::set-env name=RELEASE_TAG_NAME::$(echo ${GITHUB_REF} | sed -e "s/refs\/tags\///g" | sed -E "s/v?([0-9]+)\.([0-9+])\.([0-9]+)(-[a-zA-Z]+(\.[0-9]+)?)?/\1.\2.\3\4, \1.\2\4, \1\4/g")"
           echo "::set-env name=TAG::stable"
-          echo "::set-env name=TAG_SEMVER::true"
         if: github.event_name == 'release'
 
       - name: Get Push Tags
@@ -28,7 +27,6 @@ jobs:
         run: |
           echo "::set-env name=TAG::latest"
           echo "::set-env name=RELEASE_TAG::$(echo ${GITHUB_REF:11})"
-          echo "::set-env name=TAG_SEMVER::false"
         if: github.event_name == 'push'
 
       - name: Publish to docker hub (server)
@@ -50,8 +48,6 @@ jobs:
           tags: "${{ env.TAG }},${{ env.RELEASE_TAG }}"
           dockerfile: Dockerfile.kitchensink
           buildargs: "TAG=${{ env.TAG }}"
-          tag_semver: "${{ env.TAG_SEMVER }}"
-
 
       - name: Deploy (dev.deepforge.org)
         uses: appleboy/ssh-action@master

From 32d7506d43ba2e21865ecd63f67787c6d99d2c66 Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Tue, 7 Apr 2020 17:43:59 -0500
Subject: [PATCH 27/29] WIP- remove spaces in tag names

---
 .github/workflows/docker-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index f9b391c7f..7534268b7 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Get Release Tags
         id: get_release_tags
         run: |
-          echo "::set-env name=RELEASE_TAG_NAME::$(echo ${GITHUB_REF} | sed -e "s/refs\/tags\///g" | sed -E "s/v?([0-9]+)\.([0-9+])\.([0-9]+)(-[a-zA-Z]+(\.[0-9]+)?)?/\1.\2.\3\4, \1.\2\4, \1\4/g")"
+          echo "::set-env name=RELEASE_TAG_NAME::$(echo ${GITHUB_REF} | sed -e "s/refs\/tags\///g" | sed -E "s/v?([0-9]+)\.([0-9+])\.([0-9]+)(-[a-zA-Z]+(\.[0-9]+)?)?/\1.\2.\3\4,\1.\2\4,\1\4/g")"
           echo "::set-env name=TAG::stable"
         if: github.event_name == 'release'
 

From 727aa49574ac3ffca036d478a40bf5f7b1f70d07 Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Wed, 8 Apr 2020 10:27:23 -0500
Subject: [PATCH 28/29] WIP- Fix semver regex in release docker build action

---
 .github/workflows/docker-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 7534268b7..234ba21f2 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Get Release Tags
         id: get_release_tags
         run: |
-          echo "::set-env name=RELEASE_TAG_NAME::$(echo ${GITHUB_REF} | sed -e "s/refs\/tags\///g" | sed -E "s/v?([0-9]+)\.([0-9+])\.([0-9]+)(-[a-zA-Z]+(\.[0-9]+)?)?/\1.\2.\3\4,\1.\2\4,\1\4/g")"
+          echo "::set-env name=RELEASE_TAG_NAME::$(echo ${GITHUB_REF} | sed -e "s/refs\/tags\///g" | sed -E "s/v?([0-9]+)\.([0-9]+)\.([0-9]+)?/\1.\2.\3,\1.\2,\1/g")"
           echo "::set-env name=TAG::stable"
         if: github.event_name == 'release'
 

From 65492d70594a9443fc2dc7fc05ee927e7afad727 Mon Sep 17 00:00:00 2001
From: Brian Broll <brian.broll@gmail.com>
Date: Wed, 8 Apr 2020 11:49:24 -0500
Subject: [PATCH 29/29] Fixed issue with quotes and refactored sed cmd

---
 .github/workflows/docker-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 234ba21f2..b6404840e 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Get Release Tags
         id: get_release_tags
         run: |
-          echo "::set-env name=RELEASE_TAG_NAME::$(echo ${GITHUB_REF} | sed -e "s/refs\/tags\///g" | sed -E "s/v?([0-9]+)\.([0-9]+)\.([0-9]+)?/\1.\2.\3,\1.\2,\1/g")"
+          echo "::set-env name=RELEASE_TAG_NAME::$(echo ${GITHUB_REF} | sed -E 's/.*v?([0-9]+)\.([0-9]+)\.([0-9]+)?/\1.\2.\3,\1.\2,\1/')"
           echo "::set-env name=TAG::stable"
         if: github.event_name == 'release'