From 67af5974fc60e5a985a2ee8303ed25b154bacbfc Mon Sep 17 00:00:00 2001
From: Victor Castell <victor@victorcastell.com>
Date: Wed, 6 Apr 2022 11:51:02 +0200
Subject: [PATCH] Bump Go version to v1.18.1

Restore classic image workflow
---
 .github/workflows/dockerimage.yml | 27 +++++++++++++++++++++++++++
 Dockerfile.deprecated             | 31 +++++++++++++++++++++++++++++++
 Makefile                          |  6 +++---
 docker/start.sh                   | 10 ++++++++++
 4 files changed, 71 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/dockerimage.yml
 create mode 100644 Dockerfile.deprecated
 create mode 100644 docker/start.sh

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
new file mode 100644
index 000000000..abecc397d
--- /dev/null
+++ b/.github/workflows/dockerimage.yml
@@ -0,0 +1,27 @@
+name: Docker Image CI
+
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+      # to be used by fork patch-releases ^^
+      - 'v*.*.*-*'
+  
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build the Docker image
+      env:
+        DOCKERHUB: ${{ secrets.DOCKERHUB }}
+        DOCKERHUB_KEY: ${{ secrets.DOCKERHUB_KEY }}
+      run: |
+        ls -l
+        echo "Docker login"
+        docker login -u $DOCKERHUB -p $DOCKERHUB_KEY
+        echo "running build"
+        docker build -f Dockerfile.deprecated -t maticnetwork/heimdall:${GITHUB_REF/refs\/tags\//} .
+        echo "pushing image"
+        docker push maticnetwork/heimdall:${GITHUB_REF/refs\/tags\//}
+        echo "DONE!"
diff --git a/Dockerfile.deprecated b/Dockerfile.deprecated
new file mode 100644
index 000000000..09a9ca262
--- /dev/null
+++ b/Dockerfile.deprecated
@@ -0,0 +1,31 @@
+# Simple usage with a mounted data directory:
+# > docker build -t maticnetwork/heimdall:<tag> .
+# > docker run -it -p 26657:26657 -p 26656:26656 -v ~/.heimdalld:/root/.heimdalld maticnetwork/heimdall:<tag> heimdalld init
+
+# Start from a Debian image with the latest version of Go installed
+# and a workspace (GOPATH) configured at /go.
+FROM golang:latest
+
+# update available packages
+RUN apt-get update -y && apt-get upgrade -y && apt install build-essential -y
+
+# create go src directory and clone heimdall
+RUN mkdir -p /root/heimdall
+
+# add code to docker instance
+ADD . /root/heimdall/
+
+# change work directory
+WORKDIR /root/heimdall
+
+# GOBIN required for go install
+ENV GOBIN $GOPATH/bin
+
+# run build
+RUN make install
+
+# add volumes
+VOLUME [ "/root/.heimdalld", "./logs" ]
+
+# expose ports
+EXPOSE 1317 26656 26657
diff --git a/Makefile b/Makefile
index e6efe000b..3ad3042ac 100644
--- a/Makefile
+++ b/Makefile
@@ -134,7 +134,7 @@ build-docker-develop:
 .PHONY: contracts build
 
 PACKAGE_NAME          := github.com/maticnetwork/heimdall
-GOLANG_CROSS_VERSION  ?= v1.17.3
+GOLANG_CROSS_VERSION  ?= v1.18.1
 
 .PHONY: release-dry-run
 release-dry-run:
@@ -151,7 +151,7 @@ release-dry-run:
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v `pwd`:/go/src/$(PACKAGE_NAME) \
 		-w /go/src/$(PACKAGE_NAME) \
-		ghcr.io/troian/golang-cross:${GOLANG_CROSS_VERSION} \
+		goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \
 		--rm-dist --skip-validate --skip-publish
 
 .PHONY: release
@@ -168,5 +168,5 @@ release:
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v `pwd`:/go/src/$(PACKAGE_NAME) \
 		-w /go/src/$(PACKAGE_NAME) \
-		ghcr.io/troian/golang-cross:${GOLANG_CROSS_VERSION} \
+		goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \
 		--rm-dist --skip-validate
diff --git a/docker/start.sh b/docker/start.sh
new file mode 100644
index 000000000..32db432dc
--- /dev/null
+++ b/docker/start.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+
+# start processes
+heimdalld start > ./logs/heimdalld.log &
+heimdalld rest-server > ./logs/heimdalld-rest-server.log &
+sleep 100
+bridge start --all > ./logs/bridge.log &
+
+# tail logs
+tail -f ./logs/heimdalld.log ./logs/heimdalld-rest-server.log ./logs/bridge.log