diff --git a/Makefile b/Makefile index 071382b..e319446 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ build-all: + docker buildx build -t git.scuroneko.dev/runners/linux:bookworm -f linux.Dockerfile . docker buildx build -t git.scuroneko.dev/runners/go:bookworm -f go.Dockerfile . docker buildx build -t git.scuroneko.dev/runners/go:alpine -f go-alpine.Dockerfile . docker buildx build -t git.scuroneko.dev/runners/docker:bookworm -f docker.Dockerfile . @@ -7,6 +8,7 @@ build-all: # docker buildx build -t git.scuroneko.dev/runners/python:alpine -f python-alpine.Dockerfile . push-all: build-all + docker push git.scuroneko.dev/runners/linux:bookworm docker push git.scuroneko.dev/runners/go:bookworm docker push git.scuroneko.dev/runners/go:alpine docker push git.scuroneko.dev/runners/docker:bookworm diff --git a/README.md b/README.md index e9c101c..63a8f5b 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ ## Repository with some custom runners for actions +- `linux:bookworm` - image based on `node:24-bookworm`. packages: `git`, `curl` - `docker:bookworm` - image based on `node:24-bookworm`. packages: `docker.io`, `git` - `go:alpine` - image based on `golang:1.26-alpine`. packages: `nodejs`, `npm`, `git` - `go:bookworm` - image based on `golang:1.26-bookworm`. packages: `nodejs`, `npm`, `git` diff --git a/docker.Dockerfile b/docker.Dockerfile index 88badfc..9ff7c1f 100644 --- a/docker.Dockerfile +++ b/docker.Dockerfile @@ -1,4 +1,5 @@ FROM node:24-bookworm-slim RUN apt-get update && \ - apt-get install -y --no-install-recommends docker.io bash git ca-certificates && \ + apt-get install -y --no-install-recommends docker.io bash git ca-certificates curl && \ + apt-get clean && \ rm -rf /var/lib/apt/lists/* \ No newline at end of file diff --git a/go-alpine.Dockerfile b/go-alpine.Dockerfile index 4f652a7..c8f9d75 100644 --- a/go-alpine.Dockerfile +++ b/go-alpine.Dockerfile @@ -1,5 +1,4 @@ FROM golang:1.26-alpine ARG GOLANGCI_LINT_VERSION=v2.11.4 -RUN apk add --no-cache nodejs npm bash git ca-certificates -RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh \ - | sh -s -- -b /usr/local/bin ${GOLANGCI_LINT_VERSION} \ No newline at end of file +RUN apk add --no-cache nodejs npm bash git ca-certificates curl +RUN curl -sSfL https://golangci-lint.run/install.sh | sh -s -- -b /usr/local/bin ${GOLANGCI_LINT_VERSION} \ No newline at end of file diff --git a/go.Dockerfile b/go.Dockerfile index 0ab37b2..1c32a48 100644 --- a/go.Dockerfile +++ b/go.Dockerfile @@ -10,8 +10,7 @@ RUN apt-get update && \ apt-get update && \ apt-get install -y --no-install-recommends nodejs && \ go version && node -v && npm -v && \ - apt-get purge -y --auto-remove curl gnupg && \ + apt-get purge -y --auto-remove gnupg && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* -RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh \ - | sh -s -- -b /usr/local/bin ${GOLANGCI_LINT_VERSION} \ No newline at end of file +RUN curl -sSfL https://golangci-lint.run/install.sh | sh -s -- -b /usr/local/bin ${GOLANGCI_LINT_VERSION} \ No newline at end of file diff --git a/linux.Dockerfile b/linux.Dockerfile new file mode 100644 index 0000000..7d08da4 --- /dev/null +++ b/linux.Dockerfile @@ -0,0 +1,5 @@ +FROM node:24-bookworm +RUN apt-get update && \ + apt-get install -y --no-install-recommends ca-certificates curl git bash && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* \ No newline at end of file diff --git a/python.Dockerfile b/python.Dockerfile index a3760f0..cccc6ab 100644 --- a/python.Dockerfile +++ b/python.Dockerfile @@ -2,4 +2,5 @@ FROM python:3.14-bookworm RUN apt-get update && \ apt-get install -y --no-install-recommends nodejs npm python3-dev \ git bash ca-certificates build-essential pkg-config && \ + apt-get clean && \ rm -rf /var/lib/apt/lists/* \ No newline at end of file