Skip to content

Commit 8d05287

Browse files
authored
Merge pull request #2 from QuLogic/no-custom-image
Remove custom caddy runtime image
2 parents 9c5b945 + 765308c commit 8d05287

File tree

2 files changed

+1
-15
lines changed

2 files changed

+1
-15
lines changed

Containerfile

Lines changed: 0 additions & 8 deletions
This file was deleted.

Makefile

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
RUNTIME ?= podman
2-
CADDY_IMAGE ?= caddy-mpl
2+
CADDY_IMAGE ?= docker.io/library/caddy
33
CADDY_VERSION ?= 2.4.6
44

55
serve:
@@ -12,12 +12,6 @@ serve:
1212
$(CADDY_IMAGE):$(CADDY_VERSION) \
1313
caddy run --config /etc/caddy/Caddyfile --watch
1414

15-
image:
16-
$(RUNTIME) build \
17-
--build-arg=CADDY_VERSION=$(CADDY_VERSION) \
18-
-t $(CADDY_IMAGE):$(CADDY_VERSION) \
19-
-f Containerfile
20-
2115
fmt:
2216
$(RUNTIME) run --rm -it \
2317
-v $$PWD/Caddyfile:/etc/caddy/Caddyfile:Z \

0 commit comments

Comments
 (0)