From f0a631109e05ea1c70998442e18fbb577d7914e6 Mon Sep 17 00:00:00 2001
From: Ian Norden <iannordenn@gmail.com>
Date: Mon, 9 Nov 2020 12:15:03 -0600
Subject: [PATCH 1/4] env variables for server paths

---
 cmd/serve.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cmd/serve.go b/cmd/serve.go
index 58fedb4..2897769 100644
--- a/cmd/serve.go
+++ b/cmd/serve.go
@@ -110,6 +110,8 @@ func init() {
 }
 
 func startServers(serv sd.IService) error {
+	viper.BindEnv("server.ipcPath", "SERVER_IPC_PATH")
+	viper.BindEnv("server.httpPath", "SERVER_HTTP_PATH")
 	ipcPath := viper.GetString("server.ipcPath")
 	httpPath := viper.GetString("server.httpPath")
 	if ipcPath == "" && httpPath == "" {

From 4901b3d35b8bc1c078fafd5cd8977799184db7b0 Mon Sep 17 00:00:00 2001
From: Ian Norden <iannordenn@gmail.com>
Date: Mon, 9 Nov 2020 12:15:14 -0600
Subject: [PATCH 2/4] github actions integration

---
 .github/workflows/on-master.yaml | 25 +++++++++++++++++++++++++
 .github/workflows/on-pr.yaml     | 12 ++++++++++++
 .github/workflows/publish.yaml   | 25 +++++++++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 .github/workflows/on-master.yaml
 create mode 100644 .github/workflows/on-pr.yaml
 create mode 100644 .github/workflows/publish.yaml

diff --git a/.github/workflows/on-master.yaml b/.github/workflows/on-master.yaml
new file mode 100644
index 0000000..60f5c48
--- /dev/null
+++ b/.github/workflows/on-master.yaml
@@ -0,0 +1,25 @@
+name: Docker Compose Build
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: Run docker build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Get the version
+        id: vars
+        run: echo ::set-output name=sha::$(echo ${GITHUB_SHA:0:7})
+      - name: Run docker build
+        run: make docker-build
+      - name: Tag docker image
+        run: docker tag vulcanize/eth-statediff-service docker.pkg.github.com/vulcanize/eth-statediff-service/eth-statediff-service:${{steps.vars.outputs.sha}}
+      - name: Docker Login
+        run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u vulcanize --password-stdin
+      - name: Docker Push
+        run: docker push docker.pkg.github.com/vulcanize/eth-statediff-service/eth-statediff-service:${{steps.vars.outputs.sha}}
+
diff --git a/.github/workflows/on-pr.yaml b/.github/workflows/on-pr.yaml
new file mode 100644
index 0000000..568dd10
--- /dev/null
+++ b/.github/workflows/on-pr.yaml
@@ -0,0 +1,12 @@
+name: Docker Build
+
+on: [pull_request]
+
+jobs:
+  build:
+    name: Run docker build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Run docker build
+        run: make docker-build
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
new file mode 100644
index 0000000..577a528
--- /dev/null
+++ b/.github/workflows/publish.yaml
@@ -0,0 +1,25 @@
+name: Publish Docker image
+on:
+  release:
+    types: [published]
+jobs:
+  push_to_registries:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get the version
+        id: vars
+        run: |
+          echo ::set-output name=sha::$(echo ${GITHUB_SHA:0:7})
+          echo ::set-output name=tag::$(echo ${GITHUB_REF#refs/tags/})
+      - name: Docker Login to Github Registry
+        run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u vulcanize --password-stdin
+      - name: Docker Pull
+        run: docker pull docker.pkg.github.com/vulcanize/eth-statediff-service/eth-statediff-service:${{steps.vars.outputs.sha}}
+      - name: Docker Login to Docker Registry
+        run: echo ${{ secrets.VULCANIZEJENKINS_PAT }} | docker login -u vulcanizejenkins --password-stdin
+      - name: Tag docker image
+        run: docker tag docker.pkg.github.com/vulcanize/eth-statediff-service/eth-statediff-service:${{steps.vars.outputs.sha}} vulcanize/eth-statediff-service:${{steps.vars.outputs.tag}}
+      - name: Docker Push to Docker Hub
+        run: docker push vulcanize/eth-statediff-service:${{steps.vars.outputs.tag}}
+

From 05328a1763cde12942ff592a1c877116106f43d6 Mon Sep 17 00:00:00 2001
From: Ian Norden <iannordenn@gmail.com>
Date: Mon, 9 Nov 2020 12:19:31 -0600
Subject: [PATCH 3/4] Makefile

---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..69c96c1
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+## Build docker image
+.PHONY: docker-build
+docker-build:
+	docker build -t vulcanize/eth-statediff-service .
\ No newline at end of file

From a5eea3f4281d239f9269351f33f618036e204c00 Mon Sep 17 00:00:00 2001
From: Ian Norden <iannordenn@gmail.com>
Date: Mon, 9 Nov 2020 12:49:33 -0600
Subject: [PATCH 4/4] fix Dockerfile

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f0d4310..188d614 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,9 +12,9 @@ RUN GO111MODULE=on GCO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldfl
 # app container
 FROM alpine
 
-ARG USER
-ARG CONFIG_FILE
-ARG EXPOSE_PORT
+ARG USER="vdm"
+ARG CONFIG_FILE="./environments/example.toml"
+ARG EXPOSE_PORT=8545
 RUN adduser -Du 5000 $USER
 WORKDIR /app
 RUN chown $USER /app