From f9c1d46078bbf117311cdfe0d7617c5aab266e23 Mon Sep 17 00:00:00 2001
From: Alex Gartner <alexg@zetachain.com>
Date: Wed, 3 Jul 2024 11:13:01 -0700
Subject: [PATCH] alternative default syntax

---
 contrib/localnet/.env               |  5 -----
 contrib/localnet/docker-compose.yml | 12 ++++++------
 2 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 contrib/localnet/.env

diff --git a/contrib/localnet/.env b/contrib/localnet/.env
deleted file mode 100644
index 596d50194f..0000000000
--- a/contrib/localnet/.env
+++ /dev/null
@@ -1,5 +0,0 @@
-LOCALNET_MODE=
-E2E_ARGS=
-UPGRADE_HEIGHT=
-ZETACORED_IMPORT_GENESIS_DATA=
-ZETACORED_START_PERIOD=30s
\ No newline at end of file
diff --git a/contrib/localnet/docker-compose.yml b/contrib/localnet/docker-compose.yml
index a7dbadd9ea..880b6de8ad 100644
--- a/contrib/localnet/docker-compose.yml
+++ b/contrib/localnet/docker-compose.yml
@@ -50,7 +50,7 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: ${ZETACORED_START_PERIOD}
+      start_period: ${ZETACORED_START_PERIOD-30s}
       start_interval: 1s
     networks:
       mynetwork:
@@ -59,7 +59,7 @@ services:
     environment:
       - HOTKEY_BACKEND=file
       - HOTKEY_PASSWORD=password # test purposes only
-      - ZETACORED_IMPORT_GENESIS_DATA=${ZETACORED_IMPORT_GENESIS_DATA}
+      - ZETACORED_IMPORT_GENESIS_DATA=${ZETACORED_IMPORT_GENESIS_DATA-}
     volumes:
       - ssh:/root/.ssh
       - ~/.zetacored/genesis_data:/root/genesis_data
@@ -238,9 +238,9 @@ services:
         ipv4_address: 172.20.0.2
     entrypoint: ["/work/start-zetae2e.sh", "local"]
     environment:
-      - LOCALNET_MODE=${LOCALNET_MODE}
-      - E2E_ARGS=${E2E_ARGS}
-      - UPGRADE_HEIGHT=${UPGRADE_HEIGHT}
+      - LOCALNET_MODE=${LOCALNET_MODE-}
+      - E2E_ARGS=${E2E_ARGS-}
+      - UPGRADE_HEIGHT=${UPGRADE_HEIGHT-}
     volumes:
       - ssh:/root/.ssh
 
@@ -274,7 +274,7 @@ services:
       - zetacore0
       - upgrade-host
     environment:
-      - UPGRADE_HEIGHT=${UPGRADE_HEIGHT}
+      - UPGRADE_HEIGHT=${UPGRADE_HEIGHT-}
     volumes:
       - ssh:/root/.ssh
 volumes: