diff --git a/Makefile b/Makefile index ff63aee..071382b 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,15 @@ build-all: + 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 . - docker buildx build -t git.scuroneko.dev/runners/python:bookworm -f python.Dockerfile . +# docker buildx build -t git.scuroneko.dev/runners/python:bookworm -f python.Dockerfile . docker buildx build -t git.scuroneko.dev/runners/python:bookworm-slim -f python-slim.Dockerfile . - docker buildx build -t git.scuroneko.dev/runners/python:alpine -f python-alpine.Dockerfile . +# docker buildx build -t git.scuroneko.dev/runners/python:alpine -f python-alpine.Dockerfile . push-all: build-all + docker push git.scuroneko.dev/runners/go:bookworm + docker push git.scuroneko.dev/runners/go:alpine docker push git.scuroneko.dev/runners/docker:bookworm - docker push git.scuroneko.dev/runners/python:bookworm - docker push git.scuroneko.dev/runners/python:bookworm-slim \ No newline at end of file +# docker push git.scuroneko.dev/runners/python:bookworm + docker push git.scuroneko.dev/runners/python:bookworm-slim +# docker push git.scuroneko.dev/runners/python:alpine \ No newline at end of file diff --git a/docker.Dockerfile b/docker.Dockerfile index a0a858d..88badfc 100644 --- a/docker.Dockerfile +++ b/docker.Dockerfile @@ -1,4 +1,4 @@ -FROM node:24-bookworm +FROM node:24-bookworm-slim RUN apt-get update && \ - apt-get install -y --no-install-recommends ca-certificates curl git docker.io && \ + apt-get install -y --no-install-recommends docker.io bash git ca-certificates && \ rm -rf /var/lib/apt/lists/* \ No newline at end of file diff --git a/go-alpine.Dockerfile b/go-alpine.Dockerfile new file mode 100644 index 0000000..19b0f0a --- /dev/null +++ b/go-alpine.Dockerfile @@ -0,0 +1,2 @@ +FROM golang:1.26-alpine +RUN apk add --no-cache nodejs npm bash git ca-certificates \ No newline at end of file diff --git a/go.Dockerfile b/go.Dockerfile new file mode 100644 index 0000000..4526c20 --- /dev/null +++ b/go.Dockerfile @@ -0,0 +1,15 @@ +FROM golang:1.26-bookworm + +RUN apt-get update && \ + apt-get install -y --no-install-recommends ca-certificates curl gnupg bash git && \ + mkdir -p /etc/apt/keyrings && \ + curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \ + | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \ + echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_24.x nodistro main" \ + > /etc/apt/sources.list.d/nodesource.list && \ + 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 clean && \ + rm -rf /var/lib/apt/lists/* \ No newline at end of file diff --git a/python-slim.Dockerfile b/python-slim.Dockerfile index aad4165..a6c29d5 100644 --- a/python-slim.Dockerfile +++ b/python-slim.Dockerfile @@ -1,4 +1,15 @@ -FROM node:24-bookworm-slim +FROM python:3.14-slim-bookworm + RUN apt-get update && \ - apt-get install -y --no-install-recommends python3 python3-pip python3-venv git ca-certificates && \ + apt-get install -y --no-install-recommends ca-certificates curl gnupg bash git && \ + mkdir -p /etc/apt/keyrings && \ + curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \ + | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \ + echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_24.x nodistro main" \ + > /etc/apt/sources.list.d/nodesource.list && \ + apt-get update && \ + apt-get install -y --no-install-recommends nodejs && \ + python -V && node -v && npm -v && \ + apt-get purge -y --auto-remove curl gnupg && \ + apt-get clean && \ rm -rf /var/lib/apt/lists/* \ No newline at end of file diff --git a/python.Dockerfile b/python.Dockerfile index 0a23140..a3760f0 100644 --- a/python.Dockerfile +++ b/python.Dockerfile @@ -1,5 +1,5 @@ -FROM node:24-bookworm +FROM python:3.14-bookworm RUN apt-get update && \ - apt-get install -y --no-install-recommends python3 python3-pip python3-venv python3-dev \ + apt-get install -y --no-install-recommends nodejs npm python3-dev \ git bash ca-certificates build-essential pkg-config && \ rm -rf /var/lib/apt/lists/* \ No newline at end of file