diff --git a/.dockerignore b/.dockerignore index b7c1108..29fa987 100644 --- a/.dockerignore +++ b/.dockerignore @@ -9,6 +9,7 @@ # Entrypoint for devop container !docker/entrypoint_dev.sh +!docker/entrypoint.sh # Config file !Rocket.toml diff --git a/docker/Dockerfile.rel b/docker/Dockerfile.rel index 90cefde..acb3cb4 100644 --- a/docker/Dockerfile.rel +++ b/docker/Dockerfile.rel @@ -26,7 +26,6 @@ FROM alpine:latest RUN apk update && \ apk add --no-cache \ curl \ - cron \ libgcc \ libpq \ openssl && \ @@ -43,6 +42,7 @@ COPY --from=builder --chown=fej:fej /app/output/bin /app/bin # The workdir is changed so that the config file is read properly WORKDIR /app COPY --chown=fej:fej Rocket.toml /app/Rocket.toml +COPY ./docker/entrypoint.sh /entrypoint.sh HEALTHCHECK \ --interval=10s \ @@ -51,4 +51,4 @@ HEALTHCHECK \ --retries=3 \ CMD curl -q localhost:8000 -ENTRYPOINT ["/app/bin/server"] +ENTRYPOINT ["/entrypoint.sh"] diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh new file mode 100755 index 0000000..5c345c7 --- /dev/null +++ b/docker/entrypoint.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env sh + +crond -b + +exec "/app/bin/server" diff --git a/fejctl b/fejctl index 7ee69df..a8fc12d 100755 --- a/fejctl +++ b/fejctl @@ -11,7 +11,6 @@ function dc() { local OPTIND c build_builder release while getopts ":br" c; do - echo "$c" case $c in b ) build_builder=1 ;; r ) release=1 ;; @@ -99,7 +98,7 @@ function main() { # Running r | run ) dcr run --bin "$bin" && dc -- logs -f app ;; - rr | run-release ) dc -br -- run --build --detach ;; + rr | run-release ) dc -br -- up --build --detach && dc -r -- logs -f app ;; s | stop ) dc down ;; sr | stop-release ) dc -r stop ;;