From 956aa8b3b0496b7360ae03115a7fe65f23ce4345 Mon Sep 17 00:00:00 2001 From: Jeff Leung Date: Tue, 27 Feb 2024 16:49:43 -0800 Subject: [PATCH 1/3] Add example docker compose files to the repository --- docker/Caddyfile | 14 ++++++++++++++ docker/docker-compose.yml | 27 +++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 docker/Caddyfile create mode 100644 docker/docker-compose.yml diff --git a/docker/Caddyfile b/docker/Caddyfile new file mode 100644 index 0000000..5a401a0 --- /dev/null +++ b/docker/Caddyfile @@ -0,0 +1,14 @@ +{$GEOFEEDDOMAIN}:443 { + log { + level INFO + output file {$LOG_FILE} { + roll_size 10MB + roll_keep 10 + } + } + + # Use the ACME HTTP-01 challenge to get a cert for the configured domain. + tls {$EMAIL} + + reverse_proxy geofeed:80 +} \ No newline at end of file diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml new file mode 100644 index 0000000..e1794cf --- /dev/null +++ b/docker/docker-compose.yml @@ -0,0 +1,27 @@ +version: '3.7' +services: + geofeed: + image: git.startmywifi.com/as1024/geofeed:latest + restart: always + volumes: + - './data:/data' + environment: + - ASPNETCORE_URLS=http://+:8080 + - ConnectionString__LocalFeedCache=Data Source=/data/geofeed-cache.db + - APIKey=APIKeyHere + - NetBoxHost=netboxhosthere + caddy: + image: caddy:2 + restart: always + ports: + - 80:80 + - 443:443 + - 443:443/udp + volumes: + - ./Caddyfile:/etc/caddy/Caddyfile:ro + - ./caddy-config:/config + - ./caddy-data:/data + environment: + GEOFEEDDOMAIN: "https://geofeed.exampleas.net" + EMAIL: "noc@example.com" # The email address to use for ACME registration. + LOG_FILE: "/data/access.log" \ No newline at end of file From 9c8189bc33934ccdad30de42287145de9a9904d8 Mon Sep 17 00:00:00 2001 From: Jeff Leung Date: Tue, 27 Feb 2024 16:51:15 -0800 Subject: [PATCH 2/3] Fix port to 8080 for Caddy reverse proxy --- docker/Caddyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Caddyfile b/docker/Caddyfile index 5a401a0..40b0d2a 100644 --- a/docker/Caddyfile +++ b/docker/Caddyfile @@ -10,5 +10,5 @@ # Use the ACME HTTP-01 challenge to get a cert for the configured domain. tls {$EMAIL} - reverse_proxy geofeed:80 + reverse_proxy geofeed:8080 } \ No newline at end of file From 626ab99888fe46e1d78a7dca5fa671e0c6efc0b3 Mon Sep 17 00:00:00 2001 From: Jeff Leung Date: Tue, 27 Feb 2024 16:52:25 -0800 Subject: [PATCH 3/3] Add comment on example YAML file --- docker/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index e1794cf..53f254b 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,6 +1,7 @@ version: '3.7' services: geofeed: + # use the image tag aot-minimal for the AOT version for fastest startup performance image: git.startmywifi.com/as1024/geofeed:latest restart: always volumes: