Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify Renovate and other small improvements #97

Merged
merged 6 commits into from
Oct 31, 2024
Merged

Simplify Renovate and other small improvements #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
619e3be
Simplify to only look at build.json
lildude Oct 31, 2024
9802d69
Set version
lildude Oct 31, 2024
13e1366
Use BUILD_FROM and remove unused git and purge curl
lildude Oct 31, 2024
b3fad79
Add dev features
lildude Oct 31, 2024
656045c
Remove unneed lint test
lildude Oct 31, 2024
9d553ab
Keep curl
lildude Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
6 changes: 3 additions & 3 deletions .github/renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/lint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
5 changes: 2 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -14,8 +15,6 @@ ENV \

USER root
RUN apt-get update && apt-get install -y \
curl \
git \
jq \
redis \
xz-utils \
Expand Down
6 changes: 3 additions & 3 deletions build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down