diff --git a/Dockerfile b/Dockerfile index 5d4797b..19961ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,13 +23,17 @@ RUN cargo build --release FROM ubuntu -RUN apt update && apt install -y libcurl3 git -y && rm -rf /var/lib/{apt,dpkg,cache,log} +RUN apt update && apt install -y libcurl3 git gitstats -y && rm -rf /var/lib/{apt,dpkg,cache,log} COPY --from=build /usr/src/gitredditor/target/release/gitredditor /usr/local/bin COPY --from=fs /usr/src/gitredditor/src /usr/src/gitredditor/src -VOLUME /repo +COPY --from=fs /usr/src/gitredditor/stats.sh /usr/local/bin/gitredditor-stats + +RUN chmod +x /usr/local/bin/gitredditor-stats + +VOLUME /repo /stats WORKDIR /repo diff --git a/gitedditor.service b/gitedditor.service index 6118c12..4bd32c5 100644 --- a/gitedditor.service +++ b/gitedditor.service @@ -15,8 +15,8 @@ Restart=always ExecStartPre=/bin/bash -c "cd ${ROOT_DIR}/${GITREDDITOR_U} && /usr/bin/git pull" -ExecStart=/usr/bin/rkt --insecure-options=image run --inherit-env --dns 8.8.8.8 --volume volume-repo,kind=host,source=${ROOT_DIR}/${GITREDDITOR_U} \ - docker://repo.shimun.net/shimun/gitredditor +ExecStart=/usr/bin/rkt --insecure-options=image run --inherit-env --dns 8.8.8.8 --volume volume-repo,kind=host,source=${ROOT_DIR}/${GITREDDITOR_U} --volume volume-stats,kind=host,source=${ROOT_DIR}/stats/${GITREDDITOR_U} \ + docker://repo.shimun.net/shimun/gitredditor --exec sh -- -c 'gitredditor && gitredditor-stats' ExecStopPost=/bin/bash -c "cd ${ROOT_DIR}/${GITREDDITOR_U} && /usr/bin/git push" diff --git a/stats.sh b/stats.sh new file mode 100644 index 0000000..7ba0da3 --- /dev/null +++ b/stats.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +gitstats -c project_name=reddit -c processes=1 /repo /stats