diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Dockerfile | 10 | ||||
| -rw-r--r-- | Makefile | 10 | ||||
| -rwxr-xr-x[-rw-r--r--] | bin/envoy.sh (renamed from start.sh) | 6 | ||||
| -rwxr-xr-x | bin/init.sh | 8 | ||||
| -rw-r--r-- | etc/envoy/envoy.yml (renamed from envoy.yml) | 0 | ||||
| -rw-r--r-- | share/man/.keep | 0 |
7 files changed, 24 insertions, 12 deletions
@@ -1,4 +1,4 @@ -/sparkled +/bin/sparkled .env.* /tmp /log @@ -11,7 +11,9 @@ EXPOSE 8080 9901 10000 WORKDIR /var/www/ COPY --from=build /bin/sparkled /usr/local/bin/sparkled COPY --from=build /app/public /var/www/public -COPY envoy.yml /etc/envoy/envoy.yaml -COPY start.sh /start.sh -RUN chmod +x /start.sh -CMD ["/start.sh"] +COPY etc/envoy/envoy.yml /etc/envoy/envoy.yaml +COPY bin/envoy.sh /usr/local/bin/envoy.sh +COPY bin/init.sh /usr/local/bin/init.sh +RUN chmod +x /usr/local/bin/envoy.sh +RUN chmod +x /usr/local/bin/init.sh +CMD ["/usr/local/bin/init.sh"] @@ -4,11 +4,11 @@ IMAGE_TAG := $(PROJECT_NAME):$(GIT_BRANCH) .PHONY: clean setup build test run -sparkled: - @go build -o sparkled ./cmd/sparkled/main.go +bin/sparkled: + @go build -o ./bin/sparkled ./cmd/sparkled/main.go clean: - @rm -f sparkled + @rm -f ./bin/sparkled @go clean -testcache @docker image rm -f $(IMAGE_TAG) @@ -18,7 +18,7 @@ setup: @command -v godotenv @command -v yamlfmt -build: sparkled +build: bin/sparkled test-unit: @go test -shuffle=on ./... @@ -35,7 +35,7 @@ build-builder-image: @docker build --target build --tag $(IMAGE_TAG) . run: clean build - @godotenv -f .env.local,.env ./sparkled + @godotenv -f .env.local,.env ./bin/sparkled run-image: clean build-image @docker run --rm --network host --env-file .env.local -p 10000:10000 -p 9901:9901 -p 8080:8080 -it $(IMAGE_TAG) diff --git a/start.sh b/bin/envoy.sh index f4d8b9a..a123c62 100644..100755 --- a/start.sh +++ b/bin/envoy.sh @@ -1,5 +1,4 @@ #!/bin/sh - set -e [ -n "$DEBUG" ] && set -x @@ -28,4 +27,7 @@ if [ -z "$HMAC_SESSION_SECRET" ]; then fi echo "[$(date "+%H:%M:%S")] ==> Starting…" -/usr/local/bin/sparkled & /usr/local/bin/envoy --config-yaml "$yaml" --log-level warn --component-log-level oauth2:trace +envoy \ + --config-yaml "$yaml" \ + --log-level warn \ + --component-log-level oauth2:trace diff --git a/bin/init.sh b/bin/init.sh new file mode 100755 index 0000000..105c85a --- /dev/null +++ b/bin/init.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +[ -n "$DEBUG" ] && set -x + +echo "[$(date "+%H:%M:%S")] ==> Starting…" +/usr/local/bin/sparkled & /usr/local/bin/envoy.sh diff --git a/envoy.yml b/etc/envoy/envoy.yml index 3c8df3a..3c8df3a 100644 --- a/envoy.yml +++ b/etc/envoy/envoy.yml diff --git a/share/man/.keep b/share/man/.keep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/share/man/.keep |