From 3416a68c1a2bb005e7b44c73910eafd40dd6fb5b Mon Sep 17 00:00:00 2001 From: Zsolt Tasnadi Date: Fri, 31 Jul 2026 19:41:03 +0200 Subject: [PATCH] Revert builder-image changes; keep tic80pro:latest as-is MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The TIC-80 pipeline already runs its export in the tic80pro image and the lint/minify/docs steps stay on plain alpine — the tic80-luatools builder image and the registry rename were not wanted here. Co-Authored-By: Claude Fable 5 --- README.md | 15 --------------- builder.Dockerfile | 24 ------------------------ example-woodpecker.yaml | 18 ++++++++++++++---- 3 files changed, 14 insertions(+), 43 deletions(-) delete mode 100644 builder.Dockerfile diff --git a/README.md b/README.md index 990c575..6b13c0b 100644 --- a/README.md +++ b/README.md @@ -29,19 +29,4 @@ The pipeline uploads `$(PROJECT)-$(VERSION).lua`, `.tic`, `.html.zip` and `-docs.zip` to the droparea, then triggers `/update?platform=tic80&name=$(PROJECT)&version=$(VERSION)`. -## Builder image - -The export step uses the TIC-80 Pro image -(`git.teletypegames.org/internal/tic80pro`, built from the -`tic80pro-dockerfile` repo). For the lint / minify / docs steps, -`builder.Dockerfile` bakes Lua 5.4 + luacheck + ldoc + zip into -`git.teletypegames.org/internal/tic80-luatools`, so the pipeline no longer -runs luarocks (and a C compiler install) on every run: - -```sh -docker build --platform linux/amd64 -f builder.Dockerfile \ - -t git.teletypegames.org/internal/tic80-luatools:latest . -docker push git.teletypegames.org/internal/tic80-luatools:latest -``` - Detailed documentation lives on the wiki: `/development/tic80`. diff --git a/builder.Dockerfile b/builder.Dockerfile deleted file mode 100644 index 7876a8a..0000000 --- a/builder.Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -# CI toolbox image for the TIC-80 pipeline's lint / minify / docs steps: -# Lua 5.4 with luacheck and ldoc preinstalled, so the pipeline does not -# run luarocks (and a C compiler install) on every run. -# -# The export step keeps using the separate TIC-80 Pro image -# (git.teletypegames.org/internal/tic80pro, built from the tic80pro-dockerfile -# repo) — this image only covers the Lua tooling around it. -# -# Build & push (the CI runner is linux/amd64): -# docker build --platform linux/amd64 -f builder.Dockerfile \ -# -t git.teletypegames.org/internal/tic80-luatools:latest . -# docker push git.teletypegames.org/internal/tic80-luatools:latest - -FROM alpine:3.22 - -RUN apk add --no-cache make zip curl git lua5.4 lua5.4-dev luarocks gcc musl-dev \ - && ln -sf /usr/bin/lua5.4 /usr/bin/lua \ - && ln -sf /usr/bin/luarocks-5.4 /usr/bin/luarocks \ - && luarocks install luacheck \ - && luarocks install ldoc - -WORKDIR /workspace - -CMD ["/bin/sh"] diff --git a/example-woodpecker.yaml b/example-woodpecker.yaml index 24cf703..08e3b3f 100644 --- a/example-woodpecker.yaml +++ b/example-woodpecker.yaml @@ -6,22 +6,32 @@ steps: - 'make ci-version' - name: lint - image: git.teletypegames.org/internal/tic80-luatools:latest + image: alpine commands: + - 'apk add --no-cache make lua5.4 lua5.4-dev luarocks gcc musl-dev' + - 'ln -sf /usr/bin/lua5.4 /usr/bin/lua' + - 'ln -sf /usr/bin/luarocks-5.4 /usr/bin/luarocks' + - 'luarocks install luacheck' - 'make ci-lint' - name: minify - image: git.teletypegames.org/internal/tic80-luatools:latest + image: alpine commands: + - 'apk add --no-cache make lua5.4 curl' + - 'ln -sf /usr/bin/lua5.4 /usr/bin/lua' - 'make ci-minify' - name: docs - image: git.teletypegames.org/internal/tic80-luatools:latest + image: alpine commands: + - 'apk add --no-cache make lua5.4 lua5.4-dev luarocks gcc musl-dev zip' + - 'ln -sf /usr/bin/lua5.4 /usr/bin/lua' + - 'ln -sf /usr/bin/luarocks-5.4 /usr/bin/luarocks' + - 'luarocks install ldoc' - 'make ci-docs' - name: export - image: git.teletypegames.org/internal/tic80pro:latest + image: git.teletype.hu/internal/tic80pro:latest environment: XDG_RUNTIME_DIR: /tmp commands: