From 58f59aa06a2ffb71178903760e8606aedd32b926 Mon Sep 17 00:00:00 2001
From: Jon Hagg <jon.hagg@breakthroughenergy.org>
Date: Mon, 23 Aug 2021 14:31:24 -0700
Subject: [PATCH 1/3] ci: docker build for client image

---
 .github/workflows/docker-build.yml | 25 +++++++++++++++++++++++++
 .gitignore                         |  1 -
 build/Dockerfile                   | 24 ++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/docker-build.yml
 create mode 100644 build/Dockerfile

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
new file mode 100644
index 0000000..7928c8b
--- /dev/null
+++ b/.github/workflows/docker-build.yml
@@ -0,0 +1,25 @@
+name: Publish docker image
+
+on: 
+  workflow_dispatch:
+  push:
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to GitHub Packages
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          push: false
+          context: build
+          tags: ghcr.io/breakthrough-energy/postreise:latest
diff --git a/.gitignore b/.gitignore
index f91db91..7a70568 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,6 @@ __pycache__/
 
 # Distribution / packaging
 .Python
-build/
 develop-eggs/
 dist/
 downloads/
diff --git a/build/Dockerfile b/build/Dockerfile
new file mode 100644
index 0000000..e5c2f2d
--- /dev/null
+++ b/build/Dockerfile
@@ -0,0 +1,24 @@
+FROM python:3.8.3
+
+RUN apt-get update
+RUN ln -s /mnt/bes/pcm $HOME/ScenarioData
+
+RUN pip install -U pip pipenv ipython jupyterlab ipywidgets
+
+RUN git clone --depth 1 https://github.com/Breakthrough-Energy/PowerSimData
+RUN git clone --depth 1 https://github.com/Breakthrough-Energy/PostREISE
+
+WORKDIR /PowerSimData
+RUN mkdir -p /mnt/bes/pcm
+RUN cp -r powersimdata/utility/templates /mnt/bes/pcm/
+
+WORKDIR /PostREISE
+RUN pipenv sync --dev --system;
+RUN pip install .
+RUN pip install ../PowerSimData
+
+WORKDIR /app
+RUN rm -rf /PowerSimData
+RUN rm -rf /PostREISE
+
+CMD ["jupyter", "lab", "--port=10000", "--no-browser", "--ip=0.0.0.0", "--allow-root"]

From 5e4f85f1bc1aea9ff4b6cbf8a5038273ec15cf79 Mon Sep 17 00:00:00 2001
From: Jon Hagg <jon.hagg@breakthroughenergy.org>
Date: Mon, 23 Aug 2021 14:36:45 -0700
Subject: [PATCH 2/3] fix: update build in override yml

---
 .github/workflows/docker-build.yml | 1 -
 standalone/docker-compose.dev.yml  | 8 +-------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 7928c8b..d58a210 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -2,7 +2,6 @@ name: Publish docker image
 
 on: 
   workflow_dispatch:
-  push:
 
 jobs:
   push_to_registry:
diff --git a/standalone/docker-compose.dev.yml b/standalone/docker-compose.dev.yml
index 80b7373..9157c32 100644
--- a/standalone/docker-compose.dev.yml
+++ b/standalone/docker-compose.dev.yml
@@ -1,13 +1,7 @@
 services:
-  powersimdata: # included only for building postreise base image
-    build:
-      context: ../../PowerSimData
-    image: ghcr.io/breakthrough-energy/powersimdata:latest
   client:
     build:
-      context: ../../PostREISE
-    depends_on:
-      - powersimdata
+      context: ../build
   reisejl:
     build:
       context: ../../REISE.jl

From 7b95ee3607d4b5a1210d8c3207587a8adf3e32d5 Mon Sep 17 00:00:00 2001
From: Jon Hagg <jon.hagg@breakthroughenergy.org>
Date: Mon, 23 Aug 2021 15:44:19 -0700
Subject: [PATCH 3/3] ci: push image when run

---
 .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 d58a210..6d8f8b8 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -19,6 +19,6 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v2
         with:
-          push: false
+          push: true
           context: build
           tags: ghcr.io/breakthrough-energy/postreise:latest