From f2760a941bd2ed1815ab5ded7d0bd559ea2d6f19 Mon Sep 17 00:00:00 2001 From: Jan Grewe Date: Mon, 14 Oct 2024 16:38:30 +0200 Subject: [PATCH 1/3] Update Containerfile to use plain Nginx Only add required files to container Fix HTML title --- .dockerignore | 2 ++ Containerfile | 9 +++++++-- README.md | 6 +++--- rsbuild.config.ts | 3 +++ 4 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..c61e351e --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +dist/build.tar +dist/output diff --git a/Containerfile b/Containerfile index 261f7346..db568ca4 100644 --- a/Containerfile +++ b/Containerfile @@ -1,5 +1,10 @@ -FROM registry.access.redhat.com/ubi9/nginx-122:1-45 +FROM nginx:1.27.2-alpine + +RUN rm -r /usr/share/nginx/html \ + && mkdir /usr/share/nginx/html + +WORKDIR /usr/share/nginx/html ADD dist . -CMD nginx -g "daemon off;" \ No newline at end of file +CMD nginx -g "daemon off;" diff --git a/README.md b/README.md index ba64a5b5..ec46a087 100644 --- a/README.md +++ b/README.md @@ -20,14 +20,14 @@ Official [Meshtastic](https://meshtastic.org) web interface, that can be hosted ## Self-host The client can be self hosted using the precompiled container images with an OCI compatible runtime such as [Docker](https://www.docker.com/) or [Podman](https://podman.io/). -The base image used is [UBI9 Nginx 1.22](https://catalog.redhat.com/software/containers/ubi9/nginx-122/63f7653b9b0ca19f84f7e9a1) +The base image used is [Nginx 1.27](https://hub.docker.com/_/nginx) ```bash # With Docker -docker run -d -p 8080:8080 -p 8443:8443 --restart always --name Meshtastic-Web ghcr.io/meshtastic/web +docker run -d -p 8080:80 --restart always --name Meshtastic-Web ghcr.io/meshtastic/web #With Podman -podman run -d -p 8080:8080 -p 8443:8443 --restart always --name Meshtastic-Web ghcr.io/meshtastic/web +podman run -d -p 8080:80 --restart always --name Meshtastic-Web ghcr.io/meshtastic/web ``` ## Development & Building diff --git a/rsbuild.config.ts b/rsbuild.config.ts index b4b29017..9d47879b 100644 --- a/rsbuild.config.ts +++ b/rsbuild.config.ts @@ -24,4 +24,7 @@ export default defineConfig({ "@layouts": "./src/layouts", }, }, + html: { + title: 'Meshtastic Web', + }, }); From 56874851543a86f0ae39b367f9865261799f60a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 14 Dec 2024 09:37:41 +0000 Subject: [PATCH 2/3] Bump nanoid from 3.3.7 to 3.3.8 Bumps [nanoid](https://github.com/ai/nanoid) from 3.3.7 to 3.3.8. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.3.7...3.3.8) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] --- pnpm-lock.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bfc3743d..b9edbfd5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2535,8 +2535,8 @@ packages: mz@2.7.0: resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} - nanoid@3.3.7: - resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} + nanoid@3.3.8: + resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true @@ -6225,7 +6225,7 @@ snapshots: object-assign: 4.1.1 thenify-all: 1.6.0 - nanoid@3.3.7: {} + nanoid@3.3.8: {} node-releases@2.0.14: {} @@ -6406,13 +6406,13 @@ snapshots: postcss@8.4.38: dependencies: - nanoid: 3.3.7 + nanoid: 3.3.8 picocolors: 1.0.1 source-map-js: 1.2.0 postcss@8.4.49: dependencies: - nanoid: 3.3.7 + nanoid: 3.3.8 picocolors: 1.1.1 source-map-js: 1.2.1 From 856556c12b067cf6b67e5e943f1e9ec10db0becb Mon Sep 17 00:00:00 2001 From: Dan Ditomaso Date: Sat, 28 Dec 2024 20:21:40 -0500 Subject: [PATCH 3/3] feat: Add AttributionControl to Map to comply with OSM license requirements --- src/pages/Map.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/Map.tsx b/src/pages/Map.tsx index 68587e44..1deeee64 100644 --- a/src/pages/Map.tsx +++ b/src/pages/Map.tsx @@ -16,7 +16,7 @@ import { ZoomOutIcon, } from "lucide-react"; import { useCallback, useEffect, useState } from "react"; -import { Marker, useMap } from "react-map-gl"; +import { AttributionControl, Marker, useMap } from "react-map-gl"; import MapGl from "react-map-gl/maplibre"; export const MapPage = (): JSX.Element => { @@ -126,6 +126,7 @@ export const MapPage = (): JSX.Element => { // }} // @ts-ignore + attributionControl={false} renderWorldCopies={false} maxPitch={0} @@ -142,6 +143,9 @@ export const MapPage = (): JSX.Element => { longitude: 0, }} > + {waypoints.map((wp) => (