From 765308c4d851fc60dbc157133fd83116b0ecccd0 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Tue, 1 Mar 2022 21:47:31 -0500
Subject: [PATCH] Remove custom caddy runtime image

We don't use any optional plugins any more, so don't need the custom
image.
---
 Containerfile | 8 --------
 Makefile      | 8 +-------
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 Containerfile

diff --git a/Containerfile b/Containerfile
deleted file mode 100644
index 203833e..0000000
--- a/Containerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-ARG CADDY_VERSION=latest
-FROM docker.io/library/caddy:${CADDY_VERSION}-builder AS builder
-
-RUN xcaddy build
-
-FROM docker.io/library/caddy:${CADDY_VERSION}
-
-COPY --from=builder /usr/bin/caddy /usr/bin/caddy
diff --git a/Makefile b/Makefile
index a9124be..6100061 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 RUNTIME ?= podman
-CADDY_IMAGE ?= caddy-mpl
+CADDY_IMAGE ?= docker.io/library/caddy
 CADDY_VERSION ?= 2.4.6
 
 serve:
@@ -12,12 +12,6 @@ serve:
 	    $(CADDY_IMAGE):$(CADDY_VERSION) \
 	    caddy run --config /etc/caddy/Caddyfile --watch
 
-image:
-	$(RUNTIME) build \
-	    --build-arg=CADDY_VERSION=$(CADDY_VERSION) \
-	    -t $(CADDY_IMAGE):$(CADDY_VERSION) \
-	    -f Containerfile
-
 fmt:
 	$(RUNTIME) run --rm -it \
 	    -v $$PWD/Caddyfile:/etc/caddy/Caddyfile:Z \