Added ENV for building Docker

Author: aunefyren

.dockerignore

@@ -1,2 +1,3 @@
 files/*
-poenskelisten
+poenskelisten
+poenskelisten.exe

.gitignore

@@ -1,2 +1,3 @@
-files/*
-poenskelisten
+/files/*
+poenskelisten
+poenskelisten.exe

Dockerfile

@@ -3,6 +3,12 @@ FROM golang:1.19-alpine
 LABEL org.opencontainers.image.source=https://github.com/aunefyren/poenskelisten
 
 ENV port=8080
+ENV timezone=Europe/Oslo
+ENV dbip=localhost
+ENV dbport=3306
+ENV dbname=poenskelisten
+ENV dbusername=root
+ENV dbpassword=root
 
 RUN apk update
 RUN apk add git
@@ -15,6 +21,4 @@ COPY . .
 
 RUN CGO_ENABLED=0 go build
 
-EXPOSE 8080
-
-ENTRYPOINT /app/poenskelisten 
+ENTRYPOINT /app/poenskelisten -port ${port} -timezone ${timezone} -dbip ${dbip} -dbport ${dbport} -dbname ${dbname} -dbusername ${dbusername} -dbpassword ${dbpassword}

README.md

@@ -123,7 +123,7 @@ services:
     restart: unless-stopped
     environment:
       # The table name you chose
-      MYSQL_DATABASE: 'db'
+      MYSQL_DATABASE: 'ponske'
       # User, so you don't have to use root 
       MYSQL_USER: 'myuser'
       # Please switch this password
@@ -149,13 +149,23 @@ services:
       - ./data/:/app/files/
     ports:
       - '8080:8080'
+    environment:
+      # The container will only respect these ENV if they are empty in the config.json
+      # Useful for first setup
+      port: 8080
+      timezone: Europe/Oslo
+      dbip: db
+      dbport: 3306
+      dbname: ponske
+      dbusername: myuser
+      dbpassword: mystrongpassword
   phpmyadmin:
     image: phpmyadmin:latest
     restart: unless-stopped
     environment:
       - PMA_ARBITRARY=1
       # DB table
-      - PMA_HOST:db 
+      - PMA_HOST:ponske 
       # Root password
       - MYSQL_ROOT_PASSWORD:root 
       # Timezone

files/config.json

@@ -6,7 +6,9 @@ import (
 	"aunefyren/poenskelisten/controllers"
 	"aunefyren/poenskelisten/database"
 	"aunefyren/poenskelisten/middlewares"
+	"aunefyren/poenskelisten/models"
 	"aunefyren/poenskelisten/utilities"
+	"flag"
 	"fmt"
 	"log"
 	"net/http"
@@ -59,12 +61,20 @@ func main() {
 	log.Println("Configuration file loaded.")
 	fmt.Println("Configuration file loaded.")
 
+	// Change the config to respect flags
+	Config, err = parseFlags(Config)
+	if err != nil {
+		log.Println("Failed to parse input flags. Error: " + err.Error())
+		fmt.Println("Failed to parse input flags. Error: " + err.Error())
+
+		os.Exit(1)
+	}
+
 	// Set time zone from config if it is not empty
 	if Config.Timezone != "" {
 		loc, err := time.LoadLocation(Config.Timezone)
 		if err != nil {
 			fmt.Println("Failed to set time zone from config. Error: " + err.Error())
-			fmt.Println(err)
 			fmt.Println("Removing value...")
 
 			log.Println("Failed to set time zone from config. Error: " + err.Error())
@@ -250,3 +260,80 @@ func initRouter() *gin.Engine {
 
 	return router
 }
+
+func parseFlags(Config *models.ConfigStruct) (*models.ConfigStruct, error) {
+
+	// Define flag variables with the configuration file as default values
+	var port int
+	flag.IntVar(&port, "port", Config.PoenskelistenPort, "The port Pønskelisten is listening on.")
+
+	var timezone string
+	flag.StringVar(&timezone, "timezone", Config.Timezone, "The timezone Pønskelisten is running in.")
+
+	var dbPort int
+	flag.IntVar(&dbPort, "dbport", Config.DBPort, "The port the database is listening on.")
+
+	var dbUsername string
+	flag.StringVar(&dbUsername, "dbusername", Config.DBUsername, "The username used to interact with the database.")
+
+	var dbPassword string
+	flag.StringVar(&dbPassword, "dbpassword", Config.DBPassword, "The password used to interact with the database.")
+
+	var dbName string
+	flag.StringVar(&dbName, "dbname", Config.DBName, "The database table used within the database.")
+
+	var dbIP string
+	flag.StringVar(&dbIP, "dbip", Config.DBIP, "The IP address used to reach the database.")
+
+	// Parse the flags from input
+	flag.Parse()
+
+	// Respect the flag if config is empty
+	if Config.PoenskelistenPort == 0 {
+		Config.PoenskelistenPort = port
+	}
+
+	// Respect the flag if config is empty
+	if Config.Timezone == "" {
+		Config.Timezone = timezone
+	}
+
+	// Respect the flag if config is empty
+	if Config.DBPort == 0 {
+		Config.DBPort = dbPort
+	}
+
+	// Respect the flag if config is empty
+	if Config.DBUsername == "" {
+		Config.DBUsername = dbUsername
+	}
+
+	// Respect the flag if config is empty
+	if Config.DBPassword == "" {
+		Config.DBPassword = dbPassword
+	}
+
+	// Respect the flag if config is empty
+	if Config.DBName == "" {
+		Config.DBName = dbName
+	}
+
+	// Respect the flag if config is empty
+	if Config.DBIP == "" {
+		Config.DBIP = dbIP
+	}
+
+	// Failsafe, if port is 0, set to default 8080
+	if Config.PoenskelistenPort == 0 {
+		Config.PoenskelistenPort = 8080
+	}
+
+	// Save the new config
+	err := config.SaveConfig(Config)
+	if err != nil {
+		return &models.ConfigStruct{}, err
+	}
+
+	return Config, nil
+
+}