From d985ace48b0eab64ce8747df8fdf2bf19a56325c Mon Sep 17 00:00:00 2001
From: Garet Halliday <me@garet.holiday>
Date: Fri, 29 Sep 2023 19:30:54 -0500
Subject: [PATCH] ci
---
entrypoint.sh | 20 ++++++--------------
pggat.Dockerfile | 5 +++--
2 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/entrypoint.sh b/entrypoint.sh
index 61f26ffc..560b199c 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,20 +1,12 @@
-#!/bin/sh
+#!/bin/bash
set -e
EXEC_BIN_PATH=${PGGAT_BIN_PATH:=/usr/bin/pggat}
pggat() {
- exec $EXEC_BIN_PATH ${@}
+ if [[ ! -v "${PGGAT_RUN_MODE}" ]]; then
+ exec $EXEC_BIN_PATH run
+ else
+ exec $EXEC_BIN_PATH run --adapter="caddyfile" --config="/presets/${PGGAT_RUN_MODE}.Caddyfile"
+ fi
}
-
-
-case "${1}" in
- "")
- pggat ${@}
- ;;
- *)
- export PGGAT_RUN_MODE=${1}
- shift
- pggat ${@}
- ;;
-esac
diff --git a/pggat.Dockerfile b/pggat.Dockerfile
index 536178a0..5fee4ca5 100644
--- a/pggat.Dockerfile
+++ b/pggat.Dockerfile
@@ -5,7 +5,7 @@ WORKDIR /src
COPY . .
RUN go mod tidy
-RUN go build -o cgat ./cmd/cgat
+RUN go build -o caddygat ./cmd/caddygat
FROM alpine:latest
WORKDIR /
@@ -13,7 +13,8 @@ RUN apk add --no-cache bash
COPY entrypoint.sh .
-COPY --from=GOBUILDER /src/cgat /usr/bin/pggat
+COPY --from=GOBUILDER /src/presets /presets
+COPY --from=GOBUILDER /src/caddygat /usr/bin/pggat
ENTRYPOINT ["/entrypoint.sh"]
CMD ["pggat"]
--
GitLab