Move away from legacy build.json

.github/renovate.json

@@ -12,10 +12,9 @@
   "customManagers": [
     {
       "customType": "regex",
-      "fileMatch": "^build.json$",
+      "fileMatch": "(^|/)Dockerfile$",
       "matchStrings": [
-        "\"teslamate/teslamate:(?<currentValue>\\d+\\.\\d+\\.\\d+)\"",
+        "ARG teslamate_version=(?<currentValue>\\d+\\.\\d+\\.\\d+)"
-        "\"teslamate_version\": \"(?<currentValue>\\d+\\.\\d+\\.\\d+)\""
       ],
       "datasourceTemplate": "github-releases",
       "depNameTemplate": "teslamate-org/teslamate"

.github/workflows/integration-test.yaml

@@ -5,7 +5,6 @@ on:
     branches:
       - main
     paths:
-      - build.json
       - config.json
       - Dockerfile
       - rootfs/**
@@ -14,7 +13,6 @@ on:
     branches:
       - main
     paths:
-      - build.json
       - config.json
       - Dockerfile
       - rootfs/**

.vscode/settings.json

@@ -1,11 +1,5 @@
 {
   "json.schemas": [
-    {
-      "fileMatch": [
-        "**/build.json"
-      ],
-      "url": "https://raw.githubusercontent.com/frenck/action-addon-linter/main/src/build.schema.json"
-    },
     {
       "fileMatch": [
         "**/config.json"

Dockerfile

@@ -1,11 +1,9 @@
-ARG BUILD_FROM
+ARG teslamate_version=3.0.0
-ARG teslamate_version
+FROM teslamate/grafana:${teslamate_version} AS grafana
-FROM teslamate/grafana:${teslamate_version} as grafana
 
 #---
 
-ARG BUILD_FROM
+FROM teslamate/teslamate:${teslamate_version}
-FROM $BUILD_FROM
 
 ARG BUILD_ARCH
 ARG BASHIO_VERSION=0.16.2
@@ -49,5 +47,14 @@ COPY rootfs /
 COPY --from=grafana /dashboards /dashboards
 COPY --from=grafana /dashboards_internal /dashboards
 
+LABEL \
+    maintainer="Colin Seymour (https://github.com/lildude)" \
+    org.opencontainers.image.authors="Colin Seymour (https://github.com/lildude)" \
+    org.opencontainers.image.description="A self-hosted data logger for your Tesla." \
+    org.opencontainers.image.documentation="https://github.com/lildude/ha-addon-teslamate/blob/main/DOCS.md" \
+    org.opencontainers.image.licenses="MIT" \
+    org.opencontainers.image.source="https://github.com/lildude/ha-addon-teslamate/" \
+    org.opencontainers.image.title="Home Assistant Add-on: TeslaMate"
+
 # S6-Overlay
 ENTRYPOINT ["/init"]

README.md

@@ -18,7 +18,6 @@ Thanks to @matt-FFFFFF for maintaining this add-on in the past.
 
 [![Sponsor me to maintain this add-on][sponsor-badge]](https://github.com/sponsors/lildude)
 
-![TeslaMate Version][teslamate-version]
 ![Ingress][ingres-badge]
 ![Supported Architectures][archs]
 
@@ -85,6 +84,5 @@ Everything should pick up where it was before.
 [repo-btn]: https://my.home-assistant.io/badges/supervisor_add_addon_repository.svg
 [sponsor-badge]: https://img.shields.io/badge/Sponsor_Me-%E2%9D%A4-ec6cb9?logo=GitHub
 [teslamate-backup]: https://docs.teslamate.org/docs/maintenance/backup_restore
-[teslamate-version]: https://img.shields.io/badge/dynamic/json?label=TeslaMate%20Version&url=https%3A%2F%2Fraw.githubusercontent.com%2Flildude%2Fha-addon-teslamate%2Fmain%2Fbuild.json&query=%24.args.teslamate_version
 [teslamate]: https://github.com/teslamate-org/teslamate/
 [timescaledb]: https://github.com/expaso/hassos-addon-timescaledb

build.json

@@ -1,18 +0,0 @@
-{
-  "build_from": {
-    "aarch64": "teslamate/teslamate:3.0.0",
-    "amd64": "teslamate/teslamate:3.0.0"
-  },
-  "args": {
-    "teslamate_version": "3.0.0"
-  },
-  "labels":{
-    "maintainer": "Colin Seymour (https://github.com/lildude)",
-    "org.opencontainers.image.authors": "Colin Seymour (https://github.com/lildude)",
-    "org.opencontainers.image.description": "A self-hosted data logger for your Tesla.",
-    "org.opencontainers.image.documentation": "https://github.com/lildude/ha-addon-teslamate/blob/main/DOCS.md",
-    "org.opencontainers.image.licenses": "MIT",
-    "org.opencontainers.image.source": "https://github.com/lildude/ha-addon-teslamate/",
-    "org.opencontainers.image.title": "Home Assistant Add-on: TeslaMate"
-  }
-}