Just better

Dockerfile

@@ -22,15 +22,14 @@ COPY *.go ./
 
 RUN apk update && apk upgrade
 
+RUN echo $COMP_SITE_CERT_PEM | awk '{gsub(/\\n/,"\n")}1' > cert.pem
+RUN echo $COMP_SITE_KEY_PEM | awk '{gsub(/\\n/,"\n")}1' > key.pem
+
 # Set build variables
 RUN echo -n "-X 'main.Version=$COMP_SITE_VERSION_ARG" > ./ldflags && \
     tr -d \\n < ./ldflags > ./temp && mv ./temp ./ldflags && \
     echo -n "' -X 'main.Commit=$COMP_SITE_COMMIT_ARG" >> ./ldflags && \
     tr -d \\n < ./ldflags > ./temp && mv ./temp ./ldflags && \
-    echo -n "' -X 'main.cert=$COMP_SITE_CERT_PEM" >> ./ldflags && \
-    tr -d \\n < ./ldflags > ./temp && mv ./temp ./ldflags && \
-    echo -n "' -X 'main.key=$COMP_SITE_KEY_PEM" >> ./ldflags && \
-    tr -d \\n < ./ldflags > ./temp && mv ./temp ./ldflags && \
     echo -n "'" >> ./ldflags
 
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="$(cat ./ldflags)" -o /bin/computing

main.go

@@ -11,17 +11,20 @@ import (
 //go:embed public/*
 var embeddedFiles embed.FS
 
+//go:embed cert.pem
+var cert []byte
+
+//go:embed key.pem
+var key []byte
+
 var (
 	Commit  = "unknown"
 	Version = "unknown"
-
-	cert = ""
-	key  = ""
 )
 
 func main() {
-	if cert == "" || key == "" {
-		log.Fatalf("missing required cert and key")
+	if len(cert) == 0 || len(key) == 0 {
+		log.Fatalf("missing required cert or key")
 	}
 
 	link1, err := link.New()
@@ -41,8 +44,8 @@ func main() {
 		Team:    team1,
 		Commit:  Commit,
 		Version: Version,
-		cert:    []byte(cert),
-		key:     []byte(key),
+		cert:    cert,
+		key:     key,
 	})
 
 	log.Printf("YSTV Computing site: %s, commit: %s, version: %s\n", addr, Commit, Version)