From 4be279d03f113c83d1720f3790f97fca8de154f9 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 7 Mar 2022 19:24:03 -0300
Subject: [PATCH] fixes

---
 .woodpecker.yml |  2 +-
 Dockerfile      | 18 ++++--------------
 certbot.sh      |  0
 3 files changed, 5 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 certbot.sh

diff --git a/.woodpecker.yml b/.woodpecker.yml
index ceb5737..fc4899c 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -2,7 +2,7 @@ pipeline:
   publish:
     image: plugins/docker
     registry: registry.nulo.in
-    repo: registry.nulo.in/sutty/CHANGEME
+    repo: registry.nulo.in/sutty/certbot
     tags:
     - ${ALPINE_VERSION}
     - latest
diff --git a/Dockerfile b/Dockerfile
index 238b4e2..9453cd6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,23 +3,13 @@ ARG BASE_IMAGE=sutty/monit
 FROM ${BASE_IMAGE}:${ALPINE_VERSION}
 MAINTAINER "f <f@sutty.nl>"
 
-# Install requisites
-RUN apk add --no-cache certbot jq wget
-
-# Run certbot 
-COPY ./monit.conf /etc/monit.d/certbot.conf
-
-# Install certbot's script
-COPY ./certbot.sh /usr/local/bin/certbot
-RUN chmod +x /usr/local/bin/certbot
-
-# Add ssl group
 RUN addgroup -S -g 777 ssl
-
-RUN apk add --no-cache openssh-client rsync
 RUN install -dm 2750 -o root -g root /root/.ssh
+RUN apk add --no-cache certbot jq wget openssh-client rsync
+
+COPY ./monit.conf /etc/monit.d/certbot.conf
+COPY ./certbot.sh /usr/local/bin/certbot
 COPY ./ssh_config /root/.ssh/config
 
-# Access to certificates and challenges
 VOLUME /etc/letsencrypt
 VOLUME /var/lib/letsencrypt
diff --git a/certbot.sh b/certbot.sh
old mode 100644
new mode 100755