From 9b66b4cbc78262e2e7e7bf401baea9634e624570 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Tue, 22 Aug 2023 15:43:53 -0300
Subject: [PATCH 1/3] BREAKING CHANGE: change base container

---
 .woodpecker.yml |  4 +---
 Dockerfile      | 15 ++-------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 7db3044..7c9466b 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -10,7 +10,7 @@ pipeline:
       - "latest"
       build_args:
       - "ALPINE_VERSION=${ALPINE_VERSION}"
-      - "BASE_IMAGE=alpine"
+      - "BASE_IMAGE=gitea.nulo.in/sutty/sutty"
       purge: false
     secrets:
     - "DOCKER_PASSWORD"
@@ -21,5 +21,3 @@ matrix:
   ALPINE_VERSION:
   - "3.18.3"
   - "3.17.5"
-  - "3.16.7"
-  - "3.15.10"
diff --git a/Dockerfile b/Dockerfile
index 7ac71d6..193d0ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,30 +1,19 @@
-ARG ALPINE_VERSION=3.13.6
-ARG BASE_IMAGE=alpine
+ARG ALPINE_VERSION=3.18.3
+ARG BASE_IMAGE=gitea.nulo.in/sutty/sutty
 FROM ${BASE_IMAGE}:${ALPINE_VERSION} as build
 
-RUN apk add --no-cache tzdata
-
 COPY ./monitrc /etc/monitrc
 RUN chmod 600 /etc/monitrc
 
 FROM ${BASE_IMAGE}:${ALPINE_VERSION}
-ARG ALPINE_VERSION
 MAINTAINER "f <f@sutty.nl>"
 ENV EMAIL=monit@sutty.nl
 ENV EMAIL_FROM=monit@sutty.nl
 ENV MMONIT=mmmonit.athshe.sutty.nl
 ENV CREDENTIALS=mmmonit:mmmonit.athshe.sutty.nl
 
-# Locale
-ENV LANG="C.UTF-8"
-
-# Sutty's repository
-RUN echo ${ALPINE_VERSION} | cut -d . -f 1,2 | xargs -I {} echo https://alpine.sutty.nl/alpine/v{}/sutty | tee -a /etc/apk/repositories
-RUN wget https://alpine.sutty.nl/alpine/sutty.pub -O /etc/apk/keys/alpine@sutty.nl-5ea884cd.rsa.pub
-
 # Install monit and remove default config
 RUN apk add --no-cache tini monit knsupdate
-COPY --from=build /usr/share/zoneinfo/UTC /etc/localtime
 
 # Create directories
 RUN install -dm 2750 -o root -g root /etc/monit.d

From 1233c89affdfedf582533b1d890e03186f308fa3 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 24 Aug 2023 11:50:53 -0300
Subject: [PATCH 2/3] fix: use proper namespaces

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d93a8d9..0c93e2e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG ALPINE_VERSION=3.13.6
-ARG BASE_IMAGE=sutty/monit
+ARG ALPINE_VERSION=3.18.3
+ARG BASE_IMAGE=gitea.nulo.in/sutty/monit
 FROM ${BASE_IMAGE}:${ALPINE_VERSION}
 MAINTAINER "f <f@sutty.nl>"

From 5085c7e8df88430ca576398c57a2bad9c87420ff Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 28 Sep 2023 12:24:44 -0300
Subject: [PATCH 3/3] feat: alpine 3.18.4

---
 .woodpecker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 3430cf5..4274138 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -18,7 +18,7 @@ pipeline:
       event: "push"
 matrix:
   ALPINE_VERSION:
-  - "3.18.3"
+  - "3.18.4"
   - "3.17.5"
   - "3.16.7"
   - "3.15.10"