From 822bf7e3fffd3c44cc9c661152aef939ccb44466 Mon Sep 17 00:00:00 2001
From: Andrew Gouin <andrew@gouin.io>
Date: Thu, 3 Mar 2022 17:03:39 -0700
Subject: [PATCH] Add sommelier and evmos

---
 Dockerfile         |  2 +-
 chains.yaml        | 62 ++++++++++++++++++++++++++++------------------
 rocksdb.Dockerfile |  2 +-
 3 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 537e4c2..952781e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,7 +22,7 @@ ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.0.0-beta6/libwasmvm_
 
 RUN git checkout ${VERSION}
 
-RUN export ${BUILD_ENV} && export "${BUILD_TAGS}" && make ${MAKE_TARGET}
+RUN if [ ! -z "$BUILD_ENV" ]; then export ${BUILD_ENV}; fi; if [ ! -z "$BUILD_TAGS" ]; then export "${BUILD_TAGS}"; fi; make ${MAKE_TARGET}
 
 RUN cp ${BINARY} /root/cosmos
 
diff --git a/chains.yaml b/chains.yaml
index eddfbf4..e61b4e7 100644
--- a/chains.yaml
+++ b/chains.yaml
@@ -1,3 +1,10 @@
+# Akash
+- name: akash
+  github-organization: ovrclk
+  github-repo: akash
+  make-target: install
+  binary-path: /go/bin/akash
+
 # Cosmos Hub
 - name: gaia
   github-organization: cosmos
@@ -8,6 +15,30 @@
   rocksdb-version:
     v6.0.0: v6.10.2
 
+# Evmos
+- name: evmos
+  github-organization: tharsis
+  github-repo: evmos
+  make-target: install
+  binary-path: /go/bin/evmosd
+
+# Juno
+- name: juno
+  github-organization: CosmosContracts
+  github-repo: juno
+  make-target: install
+  binary-path: /go/bin/junod
+  build-env:
+    - LEDGER_ENABLED=false
+    - BUILD_TAGS=muslc
+
+#Omniflix
+- name: omniflix
+  github-organization: OmniFlix
+  github-repo: omniflixhub
+  make-target: install
+  binary-path: /go/bin/omniflixhubd
+
 # Osmosis
 - name: osmosis
   github-organization: osmosis-labs
@@ -24,23 +55,6 @@
   build-env:
     - BUILD_TAGS=muslc
 
-# Akash
-- name: akash
-  github-organization: ovrclk
-  github-repo: akash
-  make-target: install
-  binary-path: /go/bin/akash
-
-# Juno
-- name: juno
-  github-organization: CosmosContracts
-  github-repo: juno
-  make-target: install
-  binary-path: /go/bin/junod
-  build-env:
-    - LEDGER_ENABLED=false
-    - BUILD_TAGS=muslc
-
 # Sentinel
 - name: sentinel
   github-organization: sentinel-official
@@ -48,16 +62,16 @@
   make-target: install
   binary-path: /go/bin/sentinelhub
 
-#Omniflix
-- name: omniflix
-  github-organization: OmniFlix
-  github-repo: omniflixhub
-  make-target: install
-  binary-path: /go/bin/omniflixhubd
-
 # Sim (for testing)
 - name: sim
   github-organization: cosmos
   github-repo: cosmos-sdk
   make-target: build-linux
   binary-path: build/simd
+
+# Sommelier
+- name: sommelier
+  github-organization: peggyjv
+  github-repo: sommelier
+  make-target: install
+  binary-path: /go/bin/sommelier
diff --git a/rocksdb.Dockerfile b/rocksdb.Dockerfile
index 90b906c..e6a1841 100644
--- a/rocksdb.Dockerfile
+++ b/rocksdb.Dockerfile
@@ -49,7 +49,7 @@ ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.0.0-beta6/libwasmvm_
 
 RUN git checkout ${VERSION}
 
-RUN export ${BUILD_ENV} && export "${BUILD_TAGS}" && make ${MAKE_TARGET}
+RUN if [ ! -z "$BUILD_ENV" ]; then export ${BUILD_ENV}; fi; if [ ! -z "$BUILD_TAGS" ]; then export "${BUILD_TAGS}"; fi; make ${MAKE_TARGET}
 
 RUN cp ${BINARY} /root/cosmos