gitea-ci/index.html

@@ -4,9 +4,7 @@
 <script>
   const el = document.querySelector("pre");
   const id = location.hash.slice(1);
-  const ws = new WebSocket(
+  const ws = new WebSocket("ws://localhost:8080/logs/socket/" + id);
-    location.origin.replace(/^http/, "ws") + "/logs/socket/" + id
-  );
   window.ws = ws;
   ws.addEventListener("message", async (event) => {
     el.append(await event.data.text());

gitea-ci/main.go

@@ -36,7 +36,6 @@ type config struct {
 	giteaUrl           string
 	giteaUsername      string
 	giteaPassword      string
-	publicUrl          string
 }
 
 func parseConfig() (c config) {
@@ -60,10 +59,5 @@ func parseConfig() (c config) {
 		log.Fatal("GITEA_PASSWORD is nil")
 	}
 
-	if c.publicUrl = os.Getenv("PUBLIC_URL"); len(c.publicUrl) == 0 {
-		log.Println("PUBLIC_URL is not defined, will default to localhost:8080")
-		c.publicUrl = "http://localhost:8080"
-	}
-
 	return
 }

gitea-ci/webhook.go

@@ -140,7 +140,8 @@ func (h webhook) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	}
 
 	runId := req.Header.Get("X-Gitea-Delivery")
-	runUrl := h.config.publicUrl + "/#" + runId
+	// TODO: make dynamic
+	runUrl := "http://localhost:8080/#" + runId
 	log.Printf("New run: %s", runUrl)
 	run := runss.newRun(runId)
 	defer run.finishRun()