DEV-1074: fix bag in configs

cheqd · Apr 20, 2022 · 24c31bb · 24c31bb
1 parent 9ffa81c
commit 24c31bb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -34,7 +34,7 @@ RUN groupadd --system --gid $GID cheqd-resolver \
 # Copy compiled cheqd-did-resolver binary from Stage 1
 COPY --from=builder /root /bin
 
-# Copy base config.yml
+# Copy base config.yaml
 WORKDIR ${CHEQD_RESOLVER_HOME_DIR}
 
 USER cheqd-resolver

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -8,7 +8,7 @@ services:
       context: ../
     configs:
       - source: config
-        target: ${CHEQD_RESOLVER_HOME_DIR}/config.yml
+        target: ${CHEQD_RESOLVER_HOME_DIR}/config.yaml
     expose:
       - ${RESOLVER_PORT}
     ports:
@@ -29,4 +29,4 @@ services:
 
 configs:
   config:
-    file: ../config.yml
+    file: ../config.yaml
diff --git a/main.go b/main.go
@@ -15,20 +15,16 @@ import (
 
 func main() {
 	viper.SetConfigFile("config.yaml")
-	err := viper.ReadInConfig()
-	if err != nil { // Handle errors reading the config file
-		panic(fmt.Errorf("Fatal error config file: %w \n", err))
-	}
-
+	err1 := viper.ReadInConfig()
+
 	viper.SetConfigFile(".env")
-	err = viper.ReadInConfig()
-	if err != nil { // Handle errors reading the config file
-		panic(fmt.Errorf("Fatal error config file: %w \n", err))
+	err2 := viper.ReadInConfig()
+	if err1 != nil && err2 != nil { // Handle errors reading the config file
+		panic(fmt.Errorf("Fatal error config file: %w \n Fatal error config file: %w\n", err1, err2))
 	}
-	
+
 	viper.AutomaticEnv()
 
-
 	didResolutionPath := viper.GetString("path")
 	didResolutionListener := viper.GetString("listener")