speedtest: fix mimetype on served JS
Change-Id: Ifcb1d4f8a58a5e6120f31373b2a8c0e307e414be
diff --git a/bgpwtf/speedtest/BUILD.bazel b/bgpwtf/speedtest/BUILD.bazel
index cc431d0..7b5af44 100644
--- a/bgpwtf/speedtest/BUILD.bazel
+++ b/bgpwtf/speedtest/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_docker//container:container.bzl", "container_image")
+load("@io_bazel_rules_docker//container:container.bzl", "container_image", "container_push")
load("@io_bazel_rules_go//go:def.bzl", "go_library")
load("@io_bazel_rules_go//extras:embed_data.bzl", "go_embed_data")
@@ -24,19 +24,11 @@
entrypoint = ["/hscloud/backend"],
)
-genrule(
- name = "push_latest",
- srcs = [":latest"],
- outs = ["version.sh"],
- executable = True,
- cmd = """
- local=bazel/bgpwtf/speedtest:latest
- tag=$$(date +%s)
- remote=registry.k0.hswaw.net/bgpwtf/speedtest:$$tag
-
- docker tag $$local $$remote
- docker push $$remote
- echo -ne "#!/bin/sh\necho Pushed $$remote\n" > $(OUTS)
- """,
+container_push(
+ name = "push",
+ image = ":latest",
+ format = "Docker",
+ registry = "registry.k0.hswaw.net",
+ repository = "q3k/speedetst",
+ tag = "{BUILD_TIMESTAMP}-{STABLE_GIT_COMMIT}",
)
-
diff --git a/bgpwtf/speedtest/backend/main.go b/bgpwtf/speedtest/backend/main.go
index 7d4aece..3473352 100644
--- a/bgpwtf/speedtest/backend/main.go
+++ b/bgpwtf/speedtest/backend/main.go
@@ -134,9 +134,11 @@
w.Write(static.Data["bgpwtf/speedtest/index.html"])
})
http.HandleFunc("/speedtest.js", func(w http.ResponseWriter, r *http.Request) {
+ w.Header().Add("Content-Type", "text/javascript")
w.Write(static.Data["bgpwtf/speedtest/speedtest.js"])
})
http.HandleFunc("/speedtest_worker.js", func(w http.ResponseWriter, r *http.Request) {
+ w.Header().Add("Content-Type", "text/javascript")
w.Write(static.Data["bgpwtf/speedtest/speedtest_worker.js"])
})
diff --git a/bgpwtf/speedtest/kube/prod.jsonnet b/bgpwtf/speedtest/kube/prod.jsonnet
index fc6e083..9187f54 100644
--- a/bgpwtf/speedtest/kube/prod.jsonnet
+++ b/bgpwtf/speedtest/kube/prod.jsonnet
@@ -1,4 +1,4 @@
-local kube = import '../../../../kube/kube.libsonnet';
+local kube = import '../../../kube/kube.libsonnet';
{
local speedtest = self,
@@ -8,8 +8,7 @@
appName: "speedtest",
domain: "speedtest.hackerspace.pl",
- tag: "1563032542",
- image: "registry.k0.hswaw.net/bgpwtf/speedtest:" + cfg.tag,
+ image: "registry.k0.hswaw.net/q3k/speedetst:1601997887-f9d9c752ad8403c2b284bfeab23111b25f7e2214",
resources: {
requests: {