From a848aa64d65e91afdcc79514b6c751905ae7a2fe Mon Sep 17 00:00:00 2001
From: Roger Sikorski <roger@sikorski.cloud>
Date: Sat, 11 May 2024 13:44:17 +0200
Subject: [PATCH 1/2] feature/docker-update

---
 .gitea/workflows/dev.yaml  | 6 +++---
 .gitea/workflows/main.yaml | 6 +++---
 Dockerfile                 | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml
index 43f2a38..ac1c4c5 100644
--- a/.gitea/workflows/dev.yaml
+++ b/.gitea/workflows/dev.yaml
@@ -6,7 +6,7 @@ on:
       - main
 
 jobs:
-  Dockerfile lint:
+  dockerfile_lint:
     runs-on: k3s
     steps:
       - uses: actions/checkout@v4
@@ -15,7 +15,7 @@ jobs:
           dockerfile: Dockerfile
 
   build:
-    needs: Dockerfile lint
+    needs: dockerfile_lint
     runs-on: k3s
     steps:
       - uses: actions/checkout@v4
@@ -24,7 +24,7 @@ jobs:
         with:
           image: rogersik/monica
           registry: gitea.sikorski.cloud
-          tag: development
+          tag: "4.1-dev"
           cache: true
           username: rogersik
           password: ${{ secrets.REGISTRY_PASSWORD }}
diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml
index 897e60d..d568421 100644
--- a/.gitea/workflows/main.yaml
+++ b/.gitea/workflows/main.yaml
@@ -8,7 +8,7 @@ on:
     - cron: "0 6 * * SUN"
 
 jobs:
-  Dockerfile lint:
+  dockerfile_lint:
     runs-on: k3s
     steps:
       - uses: actions/checkout@v4
@@ -17,7 +17,7 @@ jobs:
           dockerfile: Dockerfile
 
   build:
-    needs: Dockerfile lint
+    needs: dockerfile_lint
     runs-on: k3s
     steps:
       - uses: actions/checkout@v4
@@ -27,7 +27,7 @@ jobs:
         with:
           image: rogersik/monica
           registry: gitea.sikorski.cloud
-          tag: 4
+          tag: '4.1'
           # tag_with_latest: true # https://github.com/aevea/action-kaniko/issues/66
           cache: true
           username: rogersik
diff --git a/Dockerfile b/Dockerfile
index 53c8cf5..df12df6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # https://hub.docker.com/_/monica
-FROM monica:4
+FROM monica:4.1
 
 RUN \
   # Use the default production configuration
-- 
2.49.1


From 814c378926c58df54200de17039051232b27e2fa Mon Sep 17 00:00:00 2001
From: Roger Sikorski <roger@sikorski.cloud>
Date: Sat, 11 May 2024 13:44:43 +0200
Subject: [PATCH 2/2] update

---
 .editorconfig              | 6 +++++-
 .gitea/workflows/dev.yaml  | 2 +-
 .gitea/workflows/main.yaml | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 64d3d6a..0697a10 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,4 +9,8 @@ indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
-insert_final_newline = true
\ No newline at end of file
+insert_final_newline = true
+quote_type = single
+
+[{Makefile,**.mk}]
+indent_style = tab
diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml
index ac1c4c5..31a06f8 100644
--- a/.gitea/workflows/dev.yaml
+++ b/.gitea/workflows/dev.yaml
@@ -24,7 +24,7 @@ jobs:
         with:
           image: rogersik/monica
           registry: gitea.sikorski.cloud
-          tag: "4.1-dev"
+          tag: '4.1-dev'
           cache: true
           username: rogersik
           password: ${{ secrets.REGISTRY_PASSWORD }}
diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml
index d568421..1775a48 100644
--- a/.gitea/workflows/main.yaml
+++ b/.gitea/workflows/main.yaml
@@ -5,7 +5,7 @@ on:
     branches:
       - main
   schedule:
-    - cron: "0 6 * * SUN"
+    - cron: '0 6 * * SUN'
 
 jobs:
   dockerfile_lint:
-- 
2.49.1