From 0d727eb2621c706d973987490bb3b14163693cf3 Mon Sep 17 00:00:00 2001 From: appleboy Date: Sat, 29 Apr 2023 12:07:15 +0800 Subject: [PATCH] build: optimize Dockerfile and update dependencies (#162) - Update base images to golang:1.20-alpine3.17 and alpine:3.17 - Replace `--update-cache` with `--no-cache` in apk add command - Specify exact versions for make, git, and bash packages Signed-off-by: appleboy Reviewed-on: https://gitea.com/gitea/act_runner/pulls/162 Reviewed-by: Lunny Xiao Co-authored-by: appleboy Co-committed-by: appleboy --- .gitea/workflows/release-nightly.yml | 5 +++++ .gitea/workflows/release-tag.yml | 7 ++++++- .gitea/workflows/test.yml | 6 +++++- Dockerfile | 12 ++++++------ 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/release-nightly.yml b/.gitea/workflows/release-nightly.yml index b7127ee..85c368c 100644 --- a/.gitea/workflows/release-nightly.yml +++ b/.gitea/workflows/release-nightly.yml @@ -58,6 +58,11 @@ jobs: with: fetch-depth: 0 # all history for all branches and tags + - name: dockerfile lint check + uses: https://github.com/hadolint/hadolint-action@v3.1.0 + with: + dockerfile: Dockerfile + - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/.gitea/workflows/release-tag.yml b/.gitea/workflows/release-tag.yml index 58d2171..927644b 100644 --- a/.gitea/workflows/release-tag.yml +++ b/.gitea/workflows/release-tag.yml @@ -1,6 +1,6 @@ name: release-tag -on: +on: push: tags: - '*' @@ -69,6 +69,11 @@ jobs: with: fetch-depth: 0 # all history for all branches and tags + - name: dockerfile lint check + uses: https://github.com/hadolint/hadolint-action@v3.1.0 + with: + dockerfile: Dockerfile + - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index ef7824c..7ffe3b0 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -1,5 +1,5 @@ name: checks -on: +on: - push - pull_request @@ -36,3 +36,7 @@ jobs: run: make build - name: test run: make test + - name: dockerfile lint check + uses: https://github.com/hadolint/hadolint-action@v3.1.0 + with: + dockerfile: Dockerfile diff --git a/Dockerfile b/Dockerfile index 37c9354..e530655 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ -FROM golang:alpine as builder -RUN apk add --update-cache make git +FROM golang:1.20-alpine3.17 as builder +RUN apk add --no-cache make=4.3-r1 git=2.38.5-r0 COPY . /opt/src/act_runner WORKDIR /opt/src/act_runner RUN make clean && make build -FROM alpine as runner -RUN apk add --update-cache \ - git bash \ - && rm -rf /var/cache/apk/* +FROM alpine:3.17 +RUN apk add --no-cache \ + git=2.38.5-r0 bash=5.2.15-r0 \ + && 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