From 648baae6844f28d182c4b313a6a8a91db168e5ff Mon Sep 17 00:00:00 2001
From: Marc Ole Bulling <Marc-Ole@gmx.de>
Date: Wed, 17 Aug 2022 22:50:10 +0200
Subject: [PATCH] Fixed that setup on docker was unable to complete

---
 cmd/gokapi/Main.go                                     | 4 ++--
 internal/configuration/setup/templates/setup.tmpl      | 7 ++++++-
 internal/webserver/web/templates/string_constants.tmpl | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/cmd/gokapi/Main.go b/cmd/gokapi/Main.go
index d666c8a..0b6be61 100644
--- a/cmd/gokapi/Main.go
+++ b/cmd/gokapi/Main.go
@@ -29,9 +29,9 @@ import (
 
 // Version is the current version in readable form.
 // The go generate call below needs to be modified as well
-const Version = "1.6.0"
+const Version = "1.6.1"
 
-//go:generate sh "../../build/setVersionTemplate.sh" "1.6.0"
+//go:generate sh "../../build/setVersionTemplate.sh" "1.6.1"
 //go:generate sh -c "cp \"$(go env GOROOT)/misc/wasm/wasm_exec.js\" ../../internal/webserver/web/static/js/ && echo Copied wasm_exec.js"
 //go:generate sh -c "GOOS=js GOARCH=wasm go build -o ../../internal/webserver/web/main.wasm github.com/forceu/gokapi/cmd/wasmdownloader && echo Compiled Downloader WASM module"
 //go:generate sh -c "GOOS=js GOARCH=wasm go build -o ../../internal/webserver/web/e2e.wasm github.com/forceu/gokapi/cmd/wasme2e && echo Compiled E2E WASM module"
diff --git a/internal/configuration/setup/templates/setup.tmpl b/internal/configuration/setup/templates/setup.tmpl
index 3a80053..2c5fa90 100644
--- a/internal/configuration/setup/templates/setup.tmpl
+++ b/internal/configuration/setup/templates/setup.tmpl
@@ -108,7 +108,12 @@
 					<div class="form-group">
 							<div class="col-sm-8">
 							  <label for="port">Port:</label>
-								<input type="number" class="form-control" id="port" name="port" value="53842" min="1" max="65535" placeholder="Port number" data-min="1" data-validate="validateMinLength" required onChange="urlParamChanged()" {{ if .IsDocker }}disabled{{ end }}>
+{{ if .IsDocker }}
+							<input type="number" class="form-control" id="port" value="53842" placeholder="Port number" disabled>
+							<input type="hidden" class="form-control" name="port" value="53842">
+{{ else }}
+							<input type="number" class="form-control" id="port" name="port" value="53842" min="1" max="65535" placeholder="Port number" data-min="1" data-validate="validateMinLength" required onChange="urlParamChanged()">
+{{ end }}
 							</div><br><br><br>
 							
 
diff --git a/internal/webserver/web/templates/string_constants.tmpl b/internal/webserver/web/templates/string_constants.tmpl
index 7d88d2d..a708adc 100644
--- a/internal/webserver/web/templates/string_constants.tmpl
+++ b/internal/webserver/web/templates/string_constants.tmpl
@@ -1,2 +1,2 @@
 {{define "app_name"}}Gokapi{{end}}
-{{define "version"}}1.6.0{{end}}
+{{define "version"}}1.6.1{{end}}