Merge "tweak blink animation & add gallery"
diff --git a/hswaw/kube/hswaw.jsonnet b/hswaw/kube/hswaw.jsonnet
index 41ff73d..9a1bec7 100644
--- a/hswaw/kube/hswaw.jsonnet
+++ b/hswaw/kube/hswaw.jsonnet
@@ -7,6 +7,7 @@
local frab = import "frab.libsonnet";
local pretalx = import "pretalx.libsonnet";
local cebulacamp = import "cebulacamp.libsonnet";
+local site = import "site.libsonnet";
{
hswaw(name):: mirko.Environment(name) {
@@ -20,6 +21,7 @@
frab: frab.cfg,
pretalx: pretalx.cfg,
cebulacamp: cebulacamp.cfg,
+ site: site.cfg,
},
components: {
@@ -30,6 +32,7 @@
frab: frab.component(cfg.frab, env),
pretalx: pretalx.component(cfg.pretalx, env),
cebulacamp: cebulacamp.component(cfg.cebulacamp, env),
+ site: site.component(cfg.site, env),
},
},
@@ -69,6 +72,9 @@
cebulacamp+: {
webFQDN: "cebula.camp",
},
+ site+: {
+ webFQDN: "new.hackerspace.pl",
+ },
},
},
}
diff --git a/hswaw/kube/site.libsonnet b/hswaw/kube/site.libsonnet
new file mode 100644
index 0000000..5054ceb
--- /dev/null
+++ b/hswaw/kube/site.libsonnet
@@ -0,0 +1,26 @@
+local mirko = import "../../kube/mirko.libsonnet";
+local kube = import "../../kube/kube.libsonnet";
+
+{
+ cfg:: {
+ image: "registry.k0.hswaw.net/q3k/hswaw-site:1630354516-e2bbf5901bcc2c3c260455017fafa1728568d1c2",
+ webFQDN: error "webFQDN must be set",
+ },
+
+ component(cfg, env):: mirko.Component(env, "site") {
+ local site = self,
+ cfg+: {
+ image: cfg.image,
+ container: site.GoContainer("main", "/hswaw/site/site") {
+ },
+ ports+: {
+ publicHTTP: {
+ web: {
+ port: 8080,
+ dns: cfg.webFQDN,
+ }
+ },
+ },
+ },
+ },
+}
diff --git a/hswaw/site/BUILD.bazel b/hswaw/site/BUILD.bazel
index fa2769e..6218def 100644
--- a/hswaw/site/BUILD.bazel
+++ b/hswaw/site/BUILD.bazel
@@ -42,5 +42,5 @@
format = "Docker",
registry = "registry.k0.hswaw.net",
repository = "q3k/hswaw-site",
- tag = "1626124964-{STABLE_GIT_COMMIT}",
+ tag = "1630354516-{STABLE_GIT_COMMIT}",
)
diff --git a/hswaw/site/templates/index.html b/hswaw/site/templates/index.html
index ad0eb7f..5b8bb62 100644
--- a/hswaw/site/templates/index.html
+++ b/hswaw/site/templates/index.html
@@ -77,7 +77,7 @@
</p>
<h2>Gdzie was znaleźć w Internecie?</h2>
<p>
- Jeśli nalegasz, mamy rzadko aktualizowane konta na <a href="https://twitter.com/hackerspace.pl">Twitterze</a> i <a href="https://www.facebook.com/hackerspacepl">Facebooku</a>. Lepiej jednak kontaktować się z nami <a href="https://wiki.hackerspace.pl/kontakt">przez IRC, Matrixa lub mejlowo</a>.
+ Jeśli nalegasz, mamy rzadko aktualizowane konta na <a href="https://twitter.com/hackerspacepl">Twitterze</a> i <a href="https://www.facebook.com/hackerspacepl">Facebooku</a>. Lepiej jednak kontaktować się z nami <a href="https://wiki.hackerspace.pl/kontakt">przez IRC, Matrixa lub mejlowo</a>.
</p>
</div>
</div>