From 702fbb537753c3cfb011d01e137e6136cd82bd56 Mon Sep 17 00:00:00 2001
From: Roger Sikorski <roger@sikorski.cloud>
Date: Sat, 15 Jul 2023 10:00:02 +0200
Subject: [PATCH 01/15] set gitea workflow

---
 .gitea/workflows/dev.yml  | 19 +++++++++++++++++++
 .gitea/workflows/main.yml | 21 +++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 .gitea/workflows/dev.yml
 create mode 100644 .gitea/workflows/main.yml

diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml
new file mode 100644
index 0000000..4999da7
--- /dev/null
+++ b/.gitea/workflows/dev.yml
@@ -0,0 +1,19 @@
+name: docker-monica-build mr
+
+on:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: docker
+    steps:
+      - uses: actions/checkout@v3
+      - name: Pull Docker Image for caching
+        run: docker pull gitea.sikorski.cloud/rogersik/docker-monica:latest
+      - name: Build the Docker image
+        run: |
+          docker build . \
+            --cache-from gitea.sikorski.cloud/rogersik/docker-monica:latest \
+            --file Dockerfile \
+            --tag gitea.sikorski.cloud/rogersik/docker-monica:latest \
+            --tag gitea.sikorski.cloud/rogersik/docker-monica:4
diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml
new file mode 100644
index 0000000..3eeb0ed
--- /dev/null
+++ b/.gitea/workflows/main.yml
@@ -0,0 +1,21 @@
+---
+name: docker-monica-build main
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: docker
+    steps:
+      - uses: actions/checkout@v3
+      - name: Pull Docker Image for caching
+        run: docker pull gitea.sikorski.cloud/rogersik/docker-monica:latest
+      - name: Build the Docker image
+        run: |
+          docker build . \
+            --cache-from gitea.sikorski.cloud/rogersik/docker-monica:latest \
+            --file Dockerfile \
+            --tag gitea.sikorski.cloud/rogersik/docker-monica:latest \
+            --tag gitea.sikorski.cloud/rogersik/docker-monica:4

From 3d3a2fb24ea41c3c533c89469197d6ff7a12f3a2 Mon Sep 17 00:00:00 2001
From: Roger Sikorski <roger@sikorski.cloud>
Date: Sat, 15 Jul 2023 10:00:23 +0200
Subject: [PATCH 02/15] in dev dont build main images

---
 .gitea/workflows/dev.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml
index 4999da7..b5bf437 100644
--- a/.gitea/workflows/dev.yml
+++ b/.gitea/workflows/dev.yml
@@ -9,11 +9,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Pull Docker Image for caching
-        run: docker pull gitea.sikorski.cloud/rogersik/docker-monica:latest
+        run: docker pull gitea.sikorski.cloud/rogersik/docker-monica:development
       - name: Build the Docker image
         run: |
           docker build . \
-            --cache-from gitea.sikorski.cloud/rogersik/docker-monica:latest \
+            --cache-from gitea.sikorski.cloud/rogersik/docker-monica:development \
             --file Dockerfile \
-            --tag gitea.sikorski.cloud/rogersik/docker-monica:latest \
-            --tag gitea.sikorski.cloud/rogersik/docker-monica:4
+            --tag gitea.sikorski.cloud/rogersik/docker-monica:development

From 23fa3c1d705aa0fe77d6de4e1711210a8d7dd1ae Mon Sep 17 00:00:00 2001
From: Roger Sikorski <roger@sikorski.cloud>
Date: Sat, 15 Jul 2023 10:01:02 +0200
Subject: [PATCH 03/15] deleted .drone.yml

---
 .drone.yml | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 .drone.yml

diff --git a/.drone.yml b/.drone.yml
deleted file mode 100644
index e0b4513..0000000
--- a/.drone.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-kind: pipeline
-name: default
-
-steps:
-  - name: build and publish monica docker image
-    image: plugins/docker
-    settings:
-      registry: gitea.sikorski.cloud
-      username: rogersik
-      password:
-        from_secret: "gitea_token"
-      repo: gitea.sikorski.cloud/rogersik/docker-monica
-      tags: latest,4
-      cache_from: gitea.sikorski.cloud/rogersik/docker-monica:latest
-
-  - name: notify
-    image: drillster/drone-email
-    settings:
-      host: mailcow.basecom.de
-      from:
-        from_secret: "Notifications_Address"
-      username:
-        from_secret: "Notifications_Address"
-      password:
-        from_secret: "Notifications_Address_Password"
-      recipients: [roger@sikorski.cloud]
-    when:
-      status: [failure]

From 6163b21164602920ca4e3b64d81d3a1094932a8f Mon Sep 17 00:00:00 2001
From: Roger Sikorski <roger@sikorski.cloud>
Date: Sat, 15 Jul 2023 10:01:18 +0200
Subject: [PATCH 04/15] renamed yml to yaml

---
 .gitea/workflows/{dev.yml => dev.yaml}   | 0
 .gitea/workflows/{main.yml => main.yaml} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename .gitea/workflows/{dev.yml => dev.yaml} (100%)
 rename .gitea/workflows/{main.yml => main.yaml} (100%)

diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yaml
similarity index 100%
rename from .gitea/workflows/dev.yml
rename to .gitea/workflows/dev.yaml
diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yaml
similarity index 100%
rename from .gitea/workflows/main.yml
rename to .gitea/workflows/main.yaml

From a0c748f23d00abea58ba9c2e97569365938692b8 Mon Sep 17 00:00:00 2001
From: Roger Sikorski <roger@sikorski.cloud>
Date: Sat, 15 Jul 2023 10:02:17 +0200
Subject: [PATCH 05/15] allow docker pull failure

---
 .gitea/workflows/dev.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml
index b5bf437..26cedfb 100644
--- a/.gitea/workflows/dev.yaml
+++ b/.gitea/workflows/dev.yaml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Pull Docker Image for caching
-        run: docker pull gitea.sikorski.cloud/rogersik/docker-monica:development
+        run: docker pull gitea.sikorski.cloud/rogersik/docker-monica:development || exit 0
       - name: Build the Docker image
         run: |
           docker build . \

From 4dedb8aa42804a9dcd43a00e4e755e6104d920cb Mon Sep 17 00:00:00 2001
From: Roger Sikorski <roger@sikorski.cloud>
Date: Sat, 15 Jul 2023 10:18:02 +0200
Subject: [PATCH 06/15] push docker image

---
 .gitea/workflows/dev.yaml  | 2 ++
 .gitea/workflows/main.yaml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml
index 26cedfb..1ec04e7 100644
--- a/.gitea/workflows/dev.yaml
+++ b/.gitea/workflows/dev.yaml
@@ -16,3 +16,5 @@ jobs:
             --cache-from gitea.sikorski.cloud/rogersik/docker-monica:development \
             --file Dockerfile \
             --tag gitea.sikorski.cloud/rogersik/docker-monica:development
+      - name: Push the Docker image
+        run: docker push --all-tags
diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml
index 3eeb0ed..23b6361 100644
--- a/.gitea/workflows/main.yaml
+++ b/.gitea/workflows/main.yaml
@@ -19,3 +19,5 @@ jobs:
             --file Dockerfile \
             --tag gitea.sikorski.cloud/rogersik/docker-monica:latest \
             --tag gitea.sikorski.cloud/rogersik/docker-monica:4
+      - name: Push the Docker image
+        run: docker push --all-tags

From 57c1a943c0013522bb7d4c23aafaa44d0a82c937 Mon Sep 17 00:00:00 2001
From: Roger Sikorski <roger@sikorski.cloud>
Date: Sat, 15 Jul 2023 10:18:53 +0200
Subject: [PATCH 07/15] update

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

diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml
index 1ec04e7..3fb3e42 100644
--- a/.gitea/workflows/dev.yaml
+++ b/.gitea/workflows/dev.yaml
@@ -17,4 +17,4 @@ jobs:
             --file Dockerfile \
             --tag gitea.sikorski.cloud/rogersik/docker-monica:development
       - name: Push the Docker image
-        run: docker push --all-tags
+        run: docker push gitea.sikorski.cloud/rogersik/docker-monica --all-tags
diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml
index 23b6361..9228a53 100644
--- a/.gitea/workflows/main.yaml
+++ b/.gitea/workflows/main.yaml
@@ -20,4 +20,4 @@ jobs:
             --tag gitea.sikorski.cloud/rogersik/docker-monica:latest \
             --tag gitea.sikorski.cloud/rogersik/docker-monica:4
       - name: Push the Docker image
-        run: docker push --all-tags
+        run: docker push gitea.sikorski.cloud/rogersik/docker-monica --all-tags

From 7c028d1a3090741bad3de3bdbb2fab3a53e8f02e Mon Sep 17 00:00:00 2001
From: Roger Sikorski <roger@sikorski.cloud>
Date: Sat, 15 Jul 2023 10:24:05 +0200
Subject: [PATCH 08/15] docker login added

---
 .gitea/workflows/dev.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml
index 3fb3e42..57c47b7 100644
--- a/.gitea/workflows/dev.yaml
+++ b/.gitea/workflows/dev.yaml
@@ -8,6 +8,8 @@ jobs:
     runs-on: docker
     steps:
       - uses: actions/checkout@v3
+      - name: docker login
+        run: docker login gitea.sikorski.cloud -u rogersik -p $ROGERSIK_REGISTRY_TOKEN
       - name: Pull Docker Image for caching
         run: docker pull gitea.sikorski.cloud/rogersik/docker-monica:development || exit 0
       - name: Build the Docker image

From 0291fb61a78fc10e6c53150c29ce89525e1bdc06 Mon Sep 17 00:00:00 2001
From: Roger Sikorski <roger@sikorski.cloud>
Date: Sun, 23 Jul 2023 14:14:08 +0200
Subject: [PATCH 09/15] on every push

---
 .gitea/workflows/dev.yaml  | 4 +++-
 .gitea/workflows/main.yaml | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml
index 57c47b7..e992353 100644
--- a/.gitea/workflows/dev.yaml
+++ b/.gitea/workflows/dev.yaml
@@ -1,7 +1,9 @@
 name: docker-monica-build mr
 
 on:
-  pull_request:
+  push:
+    branches-ignore:
+      - main
 
 jobs:
   build:
diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml
index 9228a53..c612101 100644
--- a/.gitea/workflows/main.yaml
+++ b/.gitea/workflows/main.yaml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - main
+  schedule:
+    - cron: "0 6 * * SUN"
 
 jobs:
   build:

From bd42ddc9fba48389dc2d77ecb05b1682dc700d99 Mon Sep 17 00:00:00 2001
From: Roger Sikorski <roger@sikorski.cloud>
Date: Sun, 23 Jul 2023 14:15:47 +0200
Subject: [PATCH 10/15] dockerfile lint added

---
 .gitea/workflows/main.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml
index c612101..c54488c 100644
--- a/.gitea/workflows/main.yaml
+++ b/.gitea/workflows/main.yaml
@@ -8,7 +8,16 @@ on:
     - cron: "0 6 * * SUN"
 
 jobs:
+  Dockerfile lint:
+    runs-on: k3s
+    steps:
+      - uses: actions/checkout@v3
+      - uses: hadolint/hadolint-action@v3.1.0
+        with:
+          dockerfile: Dockerfile
+
   build:
+    needs: Dockerfile lint
     runs-on: docker
     steps:
       - uses: actions/checkout@v3

From 338ad903020c4350d3b76dfc5ffcdad9bc48549d Mon Sep 17 00:00:00 2001
From: Roger Sikorski <roger@sikorski.cloud>
Date: Sun, 23 Jul 2023 14:16:28 +0200
Subject: [PATCH 11/15] github action dockerfile lint added

---
 .gitea/workflows/dev.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml
index e992353..277e5cd 100644
--- a/.gitea/workflows/dev.yaml
+++ b/.gitea/workflows/dev.yaml
@@ -6,6 +6,13 @@ on:
       - main
 
 jobs:
+  Dockerfile lint:
+    runs-on: k3s
+    steps:
+      - uses: actions/checkout@v3
+      - uses: hadolint/hadolint-action@v3.1.0
+        with:
+          dockerfile: Dockerfile
   build:
     runs-on: docker
     steps:

From d7dcf756c342882b93c33a76b5447a4c04e8d37e Mon Sep 17 00:00:00 2001
From: Roger Sikorski <roger@sikorski.cloud>
Date: Sun, 30 Jul 2023 20:32:42 +0200
Subject: [PATCH 12/15] needs added

Signed-off-by: Roger Sikorski <roger@sikorski.cloud>
---
 .gitea/workflows/dev.yaml  | 4 +++-
 .gitea/workflows/main.yaml | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml
index 277e5cd..02979d5 100644
--- a/.gitea/workflows/dev.yaml
+++ b/.gitea/workflows/dev.yaml
@@ -6,15 +6,17 @@ on:
       - main
 
 jobs:
-  Dockerfile lint:
+  Ddockerfile lint:
     runs-on: k3s
     steps:
       - uses: actions/checkout@v3
       - uses: hadolint/hadolint-action@v3.1.0
         with:
           dockerfile: Dockerfile
+
   build:
     runs-on: docker
+    needs: "Dockerfile lint"
     steps:
       - uses: actions/checkout@v3
       - name: docker login
diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml
index c54488c..24adb0f 100644
--- a/.gitea/workflows/main.yaml
+++ b/.gitea/workflows/main.yaml
@@ -8,7 +8,7 @@ on:
     - cron: "0 6 * * SUN"
 
 jobs:
-  Dockerfile lint:
+  Ddockerfile lint:
     runs-on: k3s
     steps:
       - uses: actions/checkout@v3
@@ -17,8 +17,8 @@ jobs:
           dockerfile: Dockerfile
 
   build:
-    needs: Dockerfile lint
     runs-on: docker
+    needs: "Dockerfile lint"
     steps:
       - uses: actions/checkout@v3
       - name: Pull Docker Image for caching

From 127be7c42a2018aa9ee1660a92919f3d2e2e779e Mon Sep 17 00:00:00 2001
From: Roger Sikorski <roger@sikorski.cloud>
Date: Sun, 30 Jul 2023 20:34:36 +0200
Subject: [PATCH 13/15] use less run

Signed-off-by: Roger Sikorski <roger@sikorski.cloud>
---
 .hadolint.yaml | 2 ++
 Dockerfile     | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 .hadolint.yaml

diff --git a/.hadolint.yaml b/.hadolint.yaml
new file mode 100644
index 0000000..81540f9
--- /dev/null
+++ b/.hadolint.yaml
@@ -0,0 +1,2 @@
+ignored:
+  - DL3008 # no need to pin versions
diff --git a/Dockerfile b/Dockerfile
index 7000346..53c8cf5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,11 @@
 # https://hub.docker.com/_/monica
 FROM monica:4
 
-# Use the default production configuration
-RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
-# increase php upload limit
-RUN sed -i 's/upload_max_filesize = 2M/upload_max_filesize = 50M/' "$PHP_INI_DIR/php.ini"
+RUN \
+  # Use the default production configuration
+  mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
+  # increase php upload limit
+  sed -i 's/upload_max_filesize = 2M/upload_max_filesize = 50M/' "$PHP_INI_DIR/php.ini"
 
 # supervisord dependencies
 RUN apt-get update && \

From cf26c006512391ff2af407be588a985620244ed4 Mon Sep 17 00:00:00 2001
From: Roger Sikorski <roger@sikorski.cloud>
Date: Sun, 30 Jul 2023 20:36:57 +0200
Subject: [PATCH 14/15] updated docker build process

Signed-off-by: Roger Sikorski <roger@sikorski.cloud>
---
 .gitea/workflows/dev.yaml  | 18 ++++++++----------
 .gitea/workflows/main.yaml | 17 ++++++++---------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml
index 02979d5..5e9048a 100644
--- a/.gitea/workflows/dev.yaml
+++ b/.gitea/workflows/dev.yaml
@@ -6,7 +6,7 @@ on:
       - main
 
 jobs:
-  Ddockerfile lint:
+  Dockerfile lint:
     runs-on: k3s
     steps:
       - uses: actions/checkout@v3
@@ -15,19 +15,17 @@ jobs:
           dockerfile: Dockerfile
 
   build:
+    needs: Dockerfile lint
     runs-on: docker
-    needs: "Dockerfile lint"
     steps:
       - uses: actions/checkout@v3
-      - name: docker login
-        run: docker login gitea.sikorski.cloud -u rogersik -p $ROGERSIK_REGISTRY_TOKEN
       - name: Pull Docker Image for caching
-        run: docker pull gitea.sikorski.cloud/rogersik/docker-monica:development || exit 0
-      - name: Build the Docker image
+        run: docker pull gitea.sikorski.cloud/rogersik/monica:development || exit 0
+      - name: Build docker image
         run: |
           docker build . \
-            --cache-from gitea.sikorski.cloud/rogersik/docker-monica:development \
+            --cache-from gitea.sikorski.cloud/rogersik/monica:development \
             --file Dockerfile \
-            --tag gitea.sikorski.cloud/rogersik/docker-monica:development
-      - name: Push the Docker image
-        run: docker push gitea.sikorski.cloud/rogersik/docker-monica --all-tags
+            --tag gitea.sikorski.cloud/rogersik/monica:development
+      - name: Push docker image
+        run: docker push gitea.sikorski.cloud/rogersik/monica:development
diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml
index 24adb0f..602bce4 100644
--- a/.gitea/workflows/main.yaml
+++ b/.gitea/workflows/main.yaml
@@ -8,7 +8,7 @@ on:
     - cron: "0 6 * * SUN"
 
 jobs:
-  Ddockerfile lint:
+  Dockerfile lint:
     runs-on: k3s
     steps:
       - uses: actions/checkout@v3
@@ -17,18 +17,17 @@ jobs:
           dockerfile: Dockerfile
 
   build:
+    needs: Dockerfile lint
     runs-on: docker
-    needs: "Dockerfile lint"
     steps:
       - uses: actions/checkout@v3
       - name: Pull Docker Image for caching
-        run: docker pull gitea.sikorski.cloud/rogersik/docker-monica:latest
-      - name: Build the Docker image
+        run: docker pull gitea.sikorski.cloud/rogersik/monica:development || exit 0
+      - name: Build docker image
         run: |
           docker build . \
-            --cache-from gitea.sikorski.cloud/rogersik/docker-monica:latest \
+            --cache-from gitea.sikorski.cloud/rogersik/monica:development \
             --file Dockerfile \
-            --tag gitea.sikorski.cloud/rogersik/docker-monica:latest \
-            --tag gitea.sikorski.cloud/rogersik/docker-monica:4
-      - name: Push the Docker image
-        run: docker push gitea.sikorski.cloud/rogersik/docker-monica --all-tags
+            --tag gitea.sikorski.cloud/rogersik/monica:development
+      - name: Push docker image
+        run: docker push gitea.sikorski.cloud/rogersik/monica:development

From 6dc2e0252fdc6afbff9865f43992159c28f3f7e9 Mon Sep 17 00:00:00 2001
From: Roger Sikorski <roger@sikorski.cloud>
Date: Sun, 30 Jul 2023 20:39:35 +0200
Subject: [PATCH 15/15] tags updated

Signed-off-by: Roger Sikorski <roger@sikorski.cloud>
---
 .gitea/workflows/dev.yaml  | 2 +-
 .gitea/workflows/main.yaml | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml
index 5e9048a..c00e210 100644
--- a/.gitea/workflows/dev.yaml
+++ b/.gitea/workflows/dev.yaml
@@ -28,4 +28,4 @@ jobs:
             --file Dockerfile \
             --tag gitea.sikorski.cloud/rogersik/monica:development
       - name: Push docker image
-        run: docker push gitea.sikorski.cloud/rogersik/monica:development
+        run: docker push gitea.sikorski.cloud/rogersik/monica --all-tags
diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml
index 602bce4..6b13961 100644
--- a/.gitea/workflows/main.yaml
+++ b/.gitea/workflows/main.yaml
@@ -22,12 +22,13 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Pull Docker Image for caching
-        run: docker pull gitea.sikorski.cloud/rogersik/monica:development || exit 0
+        run: docker pull gitea.sikorski.cloud/rogersik/monica:latest || exit 0
       - name: Build docker image
         run: |
           docker build . \
-            --cache-from gitea.sikorski.cloud/rogersik/monica:development \
+            --cache-from gitea.sikorski.cloud/rogersik/monica:latest \
             --file Dockerfile \
-            --tag gitea.sikorski.cloud/rogersik/monica:development
+            --tag gitea.sikorski.cloud/rogersik/monica:latest
+            --tag gitea.sikorski.cloud/rogersik/monica:4
       - name: Push docker image
-        run: docker push gitea.sikorski.cloud/rogersik/monica:development
+        run: docker push gitea.sikorski.cloud/rogersik/monica --all-tags