Merge branch 'develop' into 'main'

Fix: env layout change to have control over REDIS_URI

See merge request Phil/goshorly!21

.gitlab-ci.yml

@@ -8,7 +8,7 @@ stages:
 - build-docker
 
 check-format:
-  image: golang:latest
+  image: golang:alpine
   stage: test
   before_script:
   - mkdir -p $GOPATH/src/$(dirname $REPO_NAME)
@@ -22,7 +22,7 @@ check-format:
   - merge_requests
 
 check-gosec:
-  image: golang:latest
+  image: golang:alpine
   before_script:
   - mkdir -p $GOPATH/src/$(dirname $REPO_NAME)
   - ln -svf $CI_PROJECT_DIR $GOPATH/src/$REPO_NAME

db/connection.go

@@ -4,13 +4,14 @@ import (
 	"context"
 	"log"
 
+	"git.ucode.space/Phil/goshorly/utils"
 	"github.com/go-redis/redis/v8"
 )
 
 var ctx = context.Background()
 
 var Client *redis.Client = redis.NewClient(&redis.Options{
-	Addr:     "redis:6379", // use default Addr
+	Addr:     utils.REDIS_URI, // use default Addr
 	Password: "",              // no password set
 	DB:       0,               // use default DB
 })

docker-compose-proxy.yml

@@ -4,12 +4,12 @@ services:
     # build: .                  # Only if you want to Build the image on your own Server!
     image: registry.ucode.space/phil/goshorly:latest
     environment:
-      - HOST=127.0.0.1          # Domain or IP-Adress
-      - PORT=3000               # The Port you want to use
-      - HTTPS=true              # If you want to use HTTPS
-      - PROXY=true              # If you want to use a Reverse Proxy
-      - REDIS_URI=redis         # The Redis-URI (name of redis container OOTB)
-      - ENABLE_STATS=true       # Enables the /stats public frontend
+      - HOST="127.0.0.1"          # Domain or IP-Adress
+      - PORT="3000"               # The Port you want to use
+      - HTTPS="true"              # If you want to use HTTPS
+      - PROXY="true"              # If you want to use a Reverse Proxy
+      - REDIS_URI="redis"         # The Redis-URI (name of redis container OOTB)
+      - ENABLE_STATS="true"       # Enables the /stats public frontend
     depends_on:
       - redis
     restart: always

docker-compose.yml

@@ -4,12 +4,12 @@ services:
     # build: .                  # Only if you want to Build the image on your own Server!
     image: registry.ucode.space/phil/goshorly:latest
     environment:
-      - HOST=127.0.0.1          # Domain or IP-Adress
-      - PORT=3000               # The Port you want to use
-      - HTTPS=false             # If you want to use HTTPS
-      - PROXY=false             # If you want to use a Reverse Proxy
-      - REDIS_URI=redis         # The Redis-URI (name of redis container OOTB)
-      - ENABLE_STATS=true       # Enables the /stats public frontend (Default: true)
+      - HOST="127.0.0.1"          # Domain or IP-Adress
+      - PORT="3000"               # The Port you want to use
+      - HTTPS="false"             # If you want to use HTTPS
+      - PROXY="false"             # If you want to use a Reverse Proxy
+      - REDIS_URI="redis"         # The Redis-URI (name of redis container OOTB)
+      - ENABLE_STATS="true"       # Enables the /stats public frontend (Default: true)
     ports:
       - "3000:3000"
     depends_on:

main.go

@@ -17,6 +17,7 @@ import (
 var viewsfs embed.FS
 
 func main() {
+	utils.Print_Starting_Screen()
 	utils.Init_env_vars()
 	utils.Init_build_vars()
 

utils/build-vars.go

@@ -1,5 +1,10 @@
 package utils
 
+import (
+	"fmt"
+	"time"
+)
+
 var (
 	CI_COMMIT_SHORT_SHA string
 	CI_COMMIT_BRANCH    string
@@ -20,3 +25,16 @@ func Init_build_vars() {
 		CI_TAGGED = true
 	}
 }
+
+func Print_Starting_Screen() {
+	if CI_BUILD {
+		if CI_TAGGED {
+			fmt.Println("---- Starting goshorly " + CI_COMMIT_TAG + " ----")
+		} else {
+			fmt.Println("---- Starting goshorly " + CI_COMMIT_SHORT_SHA + " ----")
+		}
+	} else {
+		fmt.Println("---- Starting goshorly " + "unknown version" + " ----")
+	}
+	time.Sleep(1 * time.Second)
+}

utils/env.go

@@ -1,6 +1,7 @@
 package utils
 
 import (
+	"fmt"
 	"log"
 	"os"
 )
@@ -16,12 +17,14 @@ var (
 )
 
 func Init_env_vars() {
+	fmt.Println("-- Initializing environment variables... --")
 
 	UHOST, err := os.LookupEnv("HOST")
 	if !err {
 		log.Fatal("HOST enviroment variable not found, please set it!")
 	}
 	HOST = UHOST
+	fmt.Println("HOST: ", HOST)
 
 	UHTTPS, _ := os.LookupEnv("HTTPS")
 	if UHTTPS != "true" {
@@ -29,6 +32,7 @@ func Init_env_vars() {
 	} else {
 		HTTPS = "https"
 	}
+	fmt.Println("Proto: ", HTTPS)
 
 	UPROXY, _ := os.LookupEnv("PROXY")
 	if UPROXY != "true" {
@@ -36,6 +40,7 @@ func Init_env_vars() {
 	} else {
 		PROXY = true
 	}
+	fmt.Println("Own reverse proxy: ", PROXY)
 
 	UPORT, err := os.LookupEnv("PORT")
 	if !err {
@@ -43,11 +48,15 @@ func Init_env_vars() {
 	} else {
 		PORT = UPORT
 	}
+	fmt.Println("Port: ", PORT)
 
-	UREDIS_URI, _ := os.LookupEnv("REDIS_URI")
-	if UREDIS_URI != "" {
-		REDIS_URI = "redis"
+	UREDIS_URI, err := os.LookupEnv("REDIS_URI")
+	if !err {
+		REDIS_URI = "redis:6379"
+	} else {
+		REDIS_URI = UREDIS_URI
 	}
+	fmt.Println("Redis URI: ", REDIS_URI)
 
 	UESTATS, _ := os.LookupEnv("ENABLE_STATS")
 	if UESTATS != "false" {
@@ -55,6 +64,7 @@ func Init_env_vars() {
 	} else {
 		ESTATS = "false"
 	}
+	fmt.Println("Stats enabled: ", ESTATS)
 
 	create_string()
 
@@ -66,4 +76,7 @@ func create_string() {
 	} else {
 		URL = HTTPS + "://" + HOST + "/"
 	}
+
+	fmt.Println("URL: ", URL)
+	fmt.Println("-- Environment variables initialized! / Starting Webserver --")
 }