From 942908f72b29543d6da3a34beded288414bb88ec Mon Sep 17 00:00:00 2001 From: Ben Phelps Date: Sat, 27 Aug 2022 20:18:19 +0300 Subject: [PATCH 1/5] add link to wiki from the readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b36ccd13..b8a649fb 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ If you have a more specific issue, please open an issue on the [Issues](https:// ## Getting Started -You can run the homepage from a docker container or locally using node. +For configuration options, examples and more, [please check out the Wiki](https://github.com/benphelps/homepage/wiki). ### With Docker From 313f2ead47bc6eeca200f4390a055c61f3eeacc2 Mon Sep 17 00:00:00 2001 From: Ben Phelps Date: Sat, 27 Aug 2022 21:15:13 +0300 Subject: [PATCH 2/5] update example files --- src/skeleton/bookmarks.yaml | 35 ++++--------- src/skeleton/docker.yaml | 5 +- src/skeleton/icons/custom-icons-here.txt | 0 src/skeleton/services.yaml | 64 ++++++------------------ src/skeleton/widgets.yaml | 17 ++----- 5 files changed, 28 insertions(+), 93 deletions(-) delete mode 100644 src/skeleton/icons/custom-icons-here.txt diff --git a/src/skeleton/bookmarks.yaml b/src/skeleton/bookmarks.yaml index d553b2e3..bf8a13e1 100644 --- a/src/skeleton/bookmarks.yaml +++ b/src/skeleton/bookmarks.yaml @@ -1,34 +1,17 @@ -- Developer: # Bookmark group title - - Github: # Bookmark title - - abbr: GH # Two letter abbrivation for the bookmark - href: https://github.com/ # URL to link out to +# For configuration options and examples, please see: +# https://github.com/benphelps/homepage/wiki/Bookmarks - - StackOverflow: - - abbr: SO - href: https://stackoverflow.com/ - - - DEV: - - abbr: DT - href: https://dev.to/ +- Developer: + - Github: + - abbr: GH + href: https://github.com/ - Social: - - LinkedIn: - - abbr: LI - href: https://linkedin.com/ - - - Twitter: - - abbr: TW - href: https://twitter.com/ + - Reddit: + - abbr: RE + href: https://reddit.com/ - Entertainment: - YouTube: - abbr: YT href: https://youtube.com/ - - - Netflix: - - abbr: NF - href: https://netflix.com/ - - - Reddit: - - abbr: RE - href: https://reddit.com/ diff --git a/src/skeleton/docker.yaml b/src/skeleton/docker.yaml index 6e433193..a20926a7 100644 --- a/src/skeleton/docker.yaml +++ b/src/skeleton/docker.yaml @@ -1,6 +1,5 @@ -# Docker host configuration, used for docker integrations -# Can be either a host and port (e.g. 127.0.0.1:2375), -# or a unix socket path (e.g. /var/run/docker.sock) +# For configuration options and examples, please see: +# https://github.com/benphelps/homepage/wiki/Docker-Integration my-docker: host: 127.0.0.1 diff --git a/src/skeleton/icons/custom-icons-here.txt b/src/skeleton/icons/custom-icons-here.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/src/skeleton/services.yaml b/src/skeleton/services.yaml index e51e117b..169082a0 100644 --- a/src/skeleton/services.yaml +++ b/src/skeleton/services.yaml @@ -1,53 +1,17 @@ -- Media: # Services Group Title - - Emby: # Service Title - icon: emby.png # Icon, see: https://github.com/walkxcode/dashboard-icons or public/icons - href: http://emby.home/ # Link to the service - description: Media server # Description of the service - server: my-docker # Docker server the service is running on - container: emby # Docker container the service is running on +# For configuration options and examples, please see: +# https://github.com/benphelps/homepage/wiki/Services - - Radarr: - icon: radarr.png - href: http://radarr.home/ - description: Movie management - server: my-docker - container: radarr - widget: # Service widget configuration - type: radarr # Widget type, currently supports types radarr, sonarr, ombi or portainer - url: http://radarr.home # Base URL of the service, where the API is located - key: apikeyapikeyapikeyapikey # API key of the service +- My First Group: + - My First Service: + href: http://localhosdt/ + description: Homepage is awesome -- Documents & Files: - - ruTorrent: - icon: rutorrent.png - href: http://rutorrent.home/ - description: Torrent downloader - server: my-docker - container: rutorrent +- My Second Group: + - My Second Service: + href: http://localhosdt/ + description: Homepage is the best - - File Browser: - icon: filebrowser.png - href: "#" - description: Media File Management - server: my-docker - container: filebrowser - -- Utilities: - - Media Portainer: - icon: portainer.png - href: http://portainer.home:9443/ - description: Container management - server: my-docker - container: portainer - widget: - type: portainer - url: https://portainer.home:9443 - env: 2 - key: accesskeyaccesskeyaccesskeyaccesskey - - - Traefik: - icon: traefik.png - href: http://traefik.home/ - description: Reverse Proxy - server: my-docker - container: traefik +- My Third Group: + - My Third Service: + href: http://localhosdt/ + description: Homepage is 😎 diff --git a/src/skeleton/widgets.yaml b/src/skeleton/widgets.yaml index 011433b6..93cbb9e7 100644 --- a/src/skeleton/widgets.yaml +++ b/src/skeleton/widgets.yaml @@ -1,18 +1,7 @@ -- weather: # type of the widget - latitude: 51.5072 # widget configuration - longitude: 0.1275 - units: metric - apiKey: weather_api_key # get from https://www.weatherapi.com/ - cache: 5 # cache time in minutes - -- openweathermap: - latitude: 51.5072 # widget configuration - longitude: 0.1275 - units: metric - apiKey: openweathermap_api_key # get from https://openweathermap.org/api - cache: 10 # cache time in minutes +# For configuration options and examples, please see: +# https://github.com/benphelps/homepage/wiki/Information-Widgets - resources: cpu: true memory: true - disk: / # disk (path) to show usage for + disk: / From 169c64f6877bf0bc055b80a0b32b4c2b686663d4 Mon Sep 17 00:00:00 2001 From: Ben Phelps Date: Sun, 28 Aug 2022 00:17:18 +0300 Subject: [PATCH 3/5] attempt to add latest docker tag --- .github/workflows/docker-publish.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index a494d60f..04871e52 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -79,6 +79,8 @@ jobs: uses: docker/metadata-action@v4 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + flavor: | + latest=auto # Build and push Docker image with Buildx (don't push on PR) # https://github.com/docker/build-push-action From a9a28e14df2410779ed070bf296b90da3836a52d Mon Sep 17 00:00:00 2001 From: Ben Phelps Date: Sun, 28 Aug 2022 00:53:23 +0300 Subject: [PATCH 4/5] switch to using the latest tag --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b8a649fb..58b8e80d 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Using docker compose: version: '3.3' services: homepage: - image: ghcr.io/benphelps/homepage:main + image: ghcr.io/benphelps/homepage:latest container_name: homepage ports: - 3000:3000 @@ -47,7 +47,7 @@ services: or docker run: ```bash -docker run -p 3000:3000 -v /path/to/config:/app/config -v /var/run/docker.sock:/var/run/docker.sock ghcr.io/benphelps/homepage:main +docker run -p 3000:3000 -v /path/to/config:/app/config -v /var/run/docker.sock:/var/run/docker.sock ghcr.io/benphelps/homepage:latest ``` ### With Node From 617cbcaee1a70fb8f35794d3c0c5fb6faa991fd7 Mon Sep 17 00:00:00 2001 From: Ben Phelps Date: Sun, 28 Aug 2022 10:15:25 +0300 Subject: [PATCH 5/5] fix docker widget when network_mode is host --- src/components/services/widgets/service/docker.jsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/services/widgets/service/docker.jsx b/src/components/services/widgets/service/docker.jsx index 396398fb..4a41565d 100644 --- a/src/components/services/widgets/service/docker.jsx +++ b/src/components/services/widgets/service/docker.jsx @@ -49,8 +49,12 @@ export default function Docker({ service }) { - - + {statsData.stats.networks && ( + <> + + + + )} ); }