Modernize the makefile for the docker image.

Change default mime type inside .well-known to be plain text.
Move well-known to not be hidden. Nginx will handle rewriting the path.
2023-12-23 06:27:37 -05:00 · 2023-09-23 12:36:58 -04:00 · 2023-09-23 12:29:31 -04:00 · 2023-09-21 23:18:37 -04:00 · 2023-09-21 16:30:03 -04:00 · 2023-09-21 13:29:21 -04:00
5 changed files with 67 additions and 45 deletions
--- a/docker/server/Makefile
+++ b/docker/server/Makefile
@@ -1,35 +1,51 @@
+SHELL := bash
+.ONESHELL:
+.SHELLFLAGS := -eu -o pipefail -c
+.DELETE_ON_ERROR:
+MAKEFLAGS += --warn-undefined-variables
+MAKEFLAGS += --no-builtin-rules
+OS:=$(shell uname -s)
+
+ifeq ($(origin .RECIPEPREFIX), undefined)
+  $(error This Make does not support .RECIPEPREFIX. Please use GNU Make 4.0 or later)
+endif
+.RECIPEPREFIX = >
+
 IMAGE_NAME:=homepage
 # REMOTE_REPO:=harbor.fizz.buzz/private
+TARGET :=

-.PHONY: all
-all: build push
+.PHONY: help
+help:
+> @grep -h "##" $(MAKEFILE_LIST) | grep -v grep | sed -E 's/^([^:]*): *## */\1:  /'

 .PHONY: build
-build:
-	docker build -t $(IMAGE_NAME) -f Dockerfile ../
+build: ## Build the docker image.
+> docker build --tag $(IMAGE_NAME) --target=$(TARGET) --file Dockerfile ../../

 .PHONY: push
-push:
+push: ## Push the docker image to a remote repository.
 ifdef REMOTE_REPO
-	docker tag $(IMAGE_NAME) $(REMOTE_REPO)/$(IMAGE_NAME)
-	docker push $(REMOTE_REPO)/$(IMAGE_NAME)
+> docker tag $(IMAGE_NAME) $(REMOTE_REPO)/$(IMAGE_NAME)
+> docker push $(REMOTE_REPO)/$(IMAGE_NAME)
 else
-	@echo "REMOTE_REPO not defined, not pushing to a remote repo."
+> @echo "REMOTE_REPO not defined, not pushing to a remote repo."
 endif

 .PHONY: clean
 clean:
-	docker rmi $(IMAGE_NAME)
+> docker rmi $(IMAGE_NAME)
 ifdef REMOTE_REPO
-	docker rmi $(REMOTE_REPO)/$(IMAGE_NAME)
+> docker rmi $(REMOTE_REPO)/$(IMAGE_NAME)
 else
-	@echo "REMOTE_REPO not defined, not removing from remote repo."
+> @echo "REMOTE_REPO not defined, not removing from remote repo."
 endif

 .PHONY: run
-run:
-	docker run --rm -i -t -p "8080:8080" $(IMAGE_NAME)
+run: ## Launch the docker image
+> docker run --rm -i -t -p "8080:8080" $(IMAGE_NAME)

 .PHONY: shell
-shell:
-	docker run --rm -i -t -p "8080:8080" --entrypoint /bin/bash $(IMAGE_NAME)
+shell: ## Launch an interactive shell inside the docker image.
+shell: build
+> docker run --rm -i -t -p "8080:8080" --entrypoint /bin/bash --mount type=tmpfs,destination=/tmp $(IMAGE_NAME)
--- a/docker/server/nginx.conf
+++ b/docker/server/nginx.conf
@@ -14,6 +14,11 @@ events {
 http {
    include /etc/nginx/mime.types;
    default_type application/octet-stream;
+
+    types {
+        text/plain asc;
+    }
+
    server_tokens off;
    client_max_body_size 1m;
    sendfile on;
@@ -38,13 +43,20 @@ http {
            return 200 '{"status":"OK"}';
        }

+        location /.well-known/ {
+            alias /srv/http/public/well-known/;
+            default_type text/plain;
+        }
+
        location /.well-known/matrix/server {
          default_type application/json;
+          add_header "Access-Control-Allow-Origin" *;
          return 200 '{"m.server": "matrix.fizz.buzz:8448"}';
        }

        location /.well-known/matrix/client {
          default_type application/json;
+          add_header "Access-Control-Allow-Origin" *;
          return 200 '{"m.homeserver":{"base_url": "https://matrix.fizz.buzz"}}';
        }
    }
--- a/static/index.html
+++ b/static/index.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <html>
  <head>
    <title>FizzBuzz</title>
--- a/static/pgp.asc
+++ b/static/pgp.asc
@@ -1,34 +1,27 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----

 mDMEXZwWGhYJKwYBBAHaRw8BAQdAfv7qozKkmf4D+5PDzADsMm4aAKDGLha7+Cu0
-0H+RsWG0HVRvbSBBbGV4YW5kZXIgPHRvbUBmaXp6LmJ1eno+iJAEExYIADgWIQS4
-SBWTY8KHeReVS+En3kDZuEVcGwUCXZwWGgIbAwULCQgHAgYVCAkKCwIEFgIDAQIe
-AQIXgAAKCRAn3kDZuEVcG9glAQDX3Bzaz9sQpycc40LeLxSKQsWplfJigfr8wWOg
-C15TywEAqkTtCrTNsltdZERLMre7qnv/6RSo54OW0C4pdN7UUAa0HlRvbSBBbGV4
-YW5kZXIgPHdvcmtAZml6ei5idXp6PoiQBBMWCAA4FiEEuEgVk2PCh3kXlUvhJ95A
-2bhFXBsFAl+w+R0CGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQJ95A2bhF
-XBt6fgD+NOYnw9gz5K/q3H5LE/JvqzCSHezJmeGgif0CuU4m1/MA+gPDKME7syEt
-JsTpELEMrxWWpDW0tD/W1iJE7roGYPQPtB9Ub20gQWxleGFuZGVyIDx0b21AaGFy
-bW9uaWMuYWk+iJAEExYIADgWIQS4SBWTY8KHeReVS+En3kDZuEVcGwUCX7D5RAIb
-AwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRAn3kDZuEVcGzjDAP9pM1ScstOk
-ti+oRAsNSk8qsjIsCT9O5voDS0Q7plWlcwD/btKVFO9tPLsXhyvdB+NSwueVs7TA
-kRVjlW3hktpefg24OARdnBYaEgorBgEEAZdVAQUBAQdArbTYQgDBMG7EBFTKA6+f
-4CWgwl26Lf2b6cyCGfUw2j4DAQgHiHgEGBYIACAWIQS4SBWTY8KHeReVS+En3kDZ
-uEVcGwUCXZwWGgIbDAAKCRAn3kDZuEVcG03MAQCrkjrE+MhtvbfGaHGHlwz9QnF0
-Z519YzK8Xr8m0O+09QEA9BFCfkAzBM4D4JKeWJh/tmN9U6UexzLrRdY+W9cugAm4
-MwRdnBbKFgkrBgEEAdpHDwEBB0A/IgvgQaDhPkk72raSlUPLZaMyJfPedlfBhbgY
-uhNiSIj1BBgWCAAmAhsCFiEEuEgVk2PCh3kXlUvhJ95A2bhFXBsFAl+w+hYFCQe4
-fcwAgXYgBBkWCAAdFiEEgeZEOZZ1UC6xJRa606F5yaU8Dt4FAl2cFsoACgkQ06F5
-yaU8Dt6MngD+Krs3aYyHH6i85ebVESgBI8XeXhgACM4exepw+0UcoYkBAKK4DvV3
-oJD6o1ku6Rr8pUH962SQm8PO9pO2JBBAb6ADCRAn3kDZuEVcG9uAAP43vUsbe24/
-6tjEezAW0a4L2E1u4HNU8t53lolngs1kswEAy1HBdYEMR9TovX/kMeBHLcz1J2pM
-VRSV0JnJhj5eZwa4MwRdnBcBFgkrBgEEAdpHDwEBB0BrvpOZa4q6JHVuc1XUVQTq
-hDgLwD5SJBvzHSTXPYOZMoh+BBgWCAAmAhsgFiEEuEgVk2PCh3kXlUvhJ95A2bhF
-XBsFAl+w+hYFCQe4fZUACgkQJ95A2bhFXBs3NgEA3SFYTgRVstidfoEpEZV4DdSL
-kXaOwN3Eyba4UniClyMA/2CCxQt24vu19TyvUtOXWCp9Zi8SyIqoeiXQ4ZmhhnQO
-uDgEXZwXKBIKKwYBBAGXVQEFAQEHQA7S3cFTEu6iROopVyF4UBl3hQrEAbOc9CW+
-xXKFZYgSAwEIB4h+BBgWCAAmAhsMFiEEuEgVk2PCh3kXlUvhJ95A2bhFXBsFAl+w
-+hcFCQe4fW4ACgkQJ95A2bhFXBtUXAEAyEJCUNVSJ7qvQv5IXuwbYTX2Mh7JU3+F
-GJHO7AWBXCQA/2aLAi9kYmz9ba770XYwTeBZIv9Y6UIwIwVmFdYHC/EM
-=a/z4
+0H+RsWG0HlRvbSBBbGV4YW5kZXIgPHdvcmtAZml6ei5idXp6PoiQBBMWCAA4FiEE
+uEgVk2PCh3kXlUvhJ95A2bhFXBsFAl+w+R0CGwMFCwkIBwIGFQoJCAsCBBYCAwEC
+HgECF4AACgkQJ95A2bhFXBt6fgD+NOYnw9gz5K/q3H5LE/JvqzCSHezJmeGgif0C
+uU4m1/MA+gPDKME7syEtJsTpELEMrxWWpDW0tD/W1iJE7roGYPQPtB1Ub20gQWxl
+eGFuZGVyIDx0b21AZml6ei5idXp6PoiQBBMWCAA4FiEEuEgVk2PCh3kXlUvhJ95A
+2bhFXBsFAl2cFhoCGwMFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQJ95A2bhF
+XBvYJQEA19wc2s/bEKcnHONC3i8UikLFqZXyYoH6/MFjoAteU8sBAKpE7Qq0zbJb
+XWRESzK3u6p7/+kUqOeDltAuKXTe1FAGuDMEXZwWyhYJKwYBBAHaRw8BAQdAPyIL
+4EGg4T5JO9q2kpVDy2WjMiXz3nZXwYW4GLoTYkiI9QQYFggAJgIbAhYhBLhIFZNj
+wod5F5VL4SfeQNm4RVwbBQJlC4ZhBQkLMdaXAIF2IAQZFggAHRYhBIHmRDmWdVAu
+sSUWutOhecmlPA7eBQJdnBbKAAoJENOhecmlPA7ejJ4A/iq7N2mMhx+ovOXm1REo
+ASPF3l4YAAjOHsXqcPtFHKGJAQCiuA71d6CQ+qNZLuka/KVB/etkkJvDzvaTtiQQ
+QG+gAwkQJ95A2bhFXBtRDgEAqymMavroD5c/4+M/EZ3/d8wxfA9E3Fb/1mt4c2Zr
+NnkBAKYOM+pz/pncFnV+kF7h7TQEEYuGw1JhJVT/duA4lwsLuDMEXZwXARYJKwYB
+BAHaRw8BAQdAa76TmWuKuiR1bnNV1FUE6oQ4C8A+UiQb8x0k1z2DmTKIfgQYFggA
+JgIbIBYhBLhIFZNjwod5F5VL4SfeQNm4RVwbBQJlC4ZwBQkLMdZgAAoJECfeQNm4
+RVwb8TkA/RkBu9Ev8iDE5nvn8YF8FRiY56Z5d+SBPG4VvrCzXrmlAP46wUjIRpkM
+rTbb1GMbvYnkeOrBs/qiWjEtHHc3ZLMWD7g4BF2cFygSCisGAQQBl1UBBQEBB0AO
+0t3BUxLuokTqKVcheFAZd4UKxAGznPQlvsVyhWWIEgMBCAeIfgQYFggAJgIbDBYh
+BLhIFZNjwod5F5VL4SfeQNm4RVwbBQJlC4ZwBQkLMdY5AAoJECfeQNm4RVwbXscA
+/A8zRRTCwQKxJ8iz5jmTcVFAhl2vD781Dtv8NvcWd5t8APwIwcuFVZZA3yayhIxi
+3aqYpMRxpn2t6Nswax1MIM8DBQ==
+=dzEV
 -----END PGP PUBLIC KEY BLOCK-----
--- a/static/.well-known/keybase.txt
+++ b/static/.well-known/keybase.txt
Author	SHA1	Message	Date
Tom Alexander	a78b4eb7c4	Modernize the makefile for the docker image. All checks were successful build-homepage Build build-homepage has succeeded Details semver Build semver has succeeded Details	2023-12-23 06:27:37 -05:00
Tom Alexander	9ebcf96ed2	Change default mime type inside .well-known to be plain text. All checks were successful semver Build semver has succeeded Details build-homepage Build build-homepage has succeeded Details	2023-09-23 12:36:58 -04:00
Tom Alexander	846da7bcf9	Move well-known to not be hidden. Nginx will handle rewriting the path. All checks were successful semver Build semver has succeeded Details build-homepage Build build-homepage has succeeded Details	2023-09-23 12:29:31 -04:00
Tom Alexander	ae7240b2f4	Render my public pgp key in the browser instead of downloading it. All checks were successful semver Build semver has succeeded Details build-homepage Build build-homepage has succeeded Details	2023-09-21 23:18:37 -04:00
Tom Alexander	cee38a2c55	Remove extra subkey from pgp key. All checks were successful semver Build semver has succeeded Details build-homepage Build build-homepage has succeeded Details	2023-09-21 16:30:03 -04:00
Tom Alexander	e96557998e	Update pgp public key. All checks were successful semver Build semver has succeeded Details build-homepage Build build-homepage has succeeded Details	2023-09-21 13:29:21 -04:00
Tom Alexander	2781f8f726	Disable quirks mode for html. All checks were successful semver Build semver has succeeded Details build-homepage Build build-homepage has succeeded Details	2023-08-27 21:34:35 -04:00
Tom Alexander	3343a338e2	Add CORS header to well-known matrix endpoints. All checks were successful semver Build semver has succeeded Details build-homepage Build build-homepage has succeeded Details	2023-08-10 14:44:00 -04:00