Fix missing runner version when building images from a Dockerfile (#181 )

regression of https://gitea.com/gitea/act_runner/pulls/172 https://gitea.com/gitea/act_runner/actions/runs/400/jobs/1 In the step of `Build and push`, log output that `git: not found`. This lead to runner's version not being injected when go compile. ![image](/attachments/031ecdf2-6baa-410c-bab7-c6945140c5ad) Co-authored-by: Jason Song <i@wolfogre.com> Reviewed-on: https://gitea.com/gitea/act_runner/pulls/181 Reviewed-by: Jason Song <i@wolfogre.com> Co-authored-by: sillyguodong <gedong_1994@163.com> Co-committed-by: sillyguodong <gedong_1994@163.com>
Dockerfile: Improve signal handling by adding a runtime init (#180 )
2025-06-12 17:47:14 +02:00 · 2023-05-09 16:44:31 +08:00 · 2023-05-09 16:09:48 +08:00
1 changed files with 4 additions and 3 deletions
--- a/7
+++ b/7
@ -1,5 +1,6 @@
 FROM golang:1.20-alpine3.17 as builder
-RUN apk add --no-cache make=4.3-r1
+# Do not remove `git` here, it is required for getting runner version when executing `make build`
+RUN apk add --no-cache make=4.3-r1 git=2.38.5-r0

 COPY . /opt/src/act_runner
 WORKDIR /opt/src/act_runner
@ -8,10 +9,10 @@ RUN make clean && make build

 FROM alpine:3.17
 RUN apk add --no-cache \
-  git=2.38.5-r0 bash=5.2.15-r0 \
+  git=2.38.5-r0 bash=5.2.15-r0 tini=0.19.0-r1 \
  && rm -rf /var/cache/apk/*

 COPY --from=builder /opt/src/act_runner/act_runner /usr/local/bin/act_runner
 COPY run.sh /opt/act/run.sh

-ENTRYPOINT ["/opt/act/run.sh"]
+ENTRYPOINT ["/sbin/tini","--","/opt/act/run.sh"]