Merge branch 'main' into renovate/softprops-action-gh-release-2.x

.devcontainer/devcontainer.json

@@ -7,6 +7,11 @@
   "containerEnv": {
     "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
   },
+  "features": {
+    // "ghcr.io/devcontainers/features/node:1": {}, /* Only used for renovate testing */
+    "ghcr.io/eitsupi/devcontainer-features/jq-likes:2": {},
+    "ghcr.io/jungaretti/features/ripgrep:1": {}
+  },
   "customizations": {
     "vscode": {
       "extensions": [

.github/renovate.json

@@ -8,14 +8,14 @@
   "prBodyTemplate": "{{{table}}}{{{warnings}}}{{{notes}}}{{{changelogs}}}",
   "semanticCommits": "disabled",
   "commitMessageTopic": "{{#if (containsString depName 'ghostfolio')}}Ghostfolio{{else}}{{depName}}{{/if}}",
-  "enabledManagers": ["custom.regex", "github-actions", "dockerfile"],
+  "enabledManagers": ["custom.regex", "github-actions"],
   "customManagers": [
     {
       "customType": "regex",
       "fileMatch": "^build.json$",
       "matchStrings": [
-        "\"ghostfolio_version\": \"(?<currentValue>\\d+\\.\\d+\\.\\d+)\"",
-        "(aarch64|amd64|armhf|armv7|i386):\\s[\"']?(?<depName>.*?):(?<currentValue>.*?)[\"']?\\s"
+        "\"ghostfolio/ghostfolio:(?<currentValue>\\d+\\.\\d+\\.\\d+)\"",
+        "\"ghostfolio_version\": \"(?<currentValue>\\d+\\.\\d+\\.\\d+)\""
       ],
       "datasourceTemplate": "github-releases",
       "depNameTemplate": "ghostfolio/ghostfolio"

.github/workflows/lint.yaml

@@ -20,13 +20,3 @@ jobs:
         uses: frenck/action-addon-linter@v2
         with:
           path: "./"
-
-      - name: Check versions match
-        run: |
-          docker_ver=$(grep "FROM ghostfolio/ghostfolio" Dockerfile | cut -d':' -f2)
-          build_ver=$(jq -r ".args.ghostfolio_version" build.json)
-          if [ "$docker_ver" != "$build_ver" ]; then
-            echo -e "\033[31;1mGhostfolio versions don't match: Dockerfile => ${docker_ver} | build.json => ${build_ver}\033[0m"
-            exit 1
-          fi
-          echo -e "\033[32;1mGhostfolio versions match: Dockerfile => ${docker_ver} | build.json => ${build_ver}\033[0m"

Dockerfile

@@ -1,4 +1,5 @@
-FROM ghostfolio/ghostfolio:2.120.0
+ARG BUILD_FROM
+FROM $BUILD_FROM
 
 ARG BUILD_ARCH
 ARG BASHIO_VERSION=0.16.2
@@ -14,8 +15,6 @@ ENV \
 
 USER root
 RUN apt-get update && apt-get install -y \
-        curl \
-        git \
         jq \
         redis \
         xz-utils \

build.json

@@ -1,8 +1,8 @@
 {
   "build_from": {
-    "aarch64": "ghostfolio/ghostfolio:not-used",
-    "amd64": "ghostfolio/ghostfolio:not-used",
-    "armv7": "ghostfolio/ghostfolio:not-used"
+    "aarch64": "ghostfolio/ghostfolio:2.120.0",
+    "amd64": "ghostfolio/ghostfolio:2.120.0",
+    "armv7": "ghostfolio/ghostfolio:2.120.0"
   },
   "args": {
     "ghostfolio_version": "2.120.0"