From 3c6c6cf5e1e60c35cb6089a00adcf7a62071e208 Mon Sep 17 00:00:00 2001
From: Oh My Felix <ohmyfelixbot@gmail.com>
Date: Fri, 29 May 2026 07:58:11 +0000
Subject: [PATCH] Add CI rollout baseline

---
 .github/workflows/docker.yml | 39 ++++++++++++++++++++++++++++++++----
 Makefile                     | 19 +++++++++++++++++-
 README.md                    | 10 ++++-----
 3 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 9e76a9a..9135b1f 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -13,14 +13,29 @@ permissions:
   contents: read
 
 jobs:
+  test:
+    name: "Test"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
+
+      - name: Test representative images
+        run: make test
+
   build:
     name: "Build"
+    needs: test
     uses: dockette/.github/.github/workflows/docker.yml@master
     secrets: inherit
     with:
-        image: "dockette/ci"
-        tag: "${{ matrix.item }}"
-        context: "${{ matrix.item }}"
+      image: "dockette/ci"
+      tag: "${{ matrix.item }}"
+      context: "${{ matrix.item }}"
+      push: ${{ github.ref == 'refs/heads/master' }}
     strategy:
       matrix:
         include:
@@ -60,4 +75,20 @@ jobs:
           # Ansitest
           - item: ansitest
 
-      fail-fast: false
\ No newline at end of file
+      fail-fast: false
+
+  docs:
+    name: "Docs"
+    needs: build
+    runs-on: ubuntu-latest
+    if: ${{ github.ref == 'refs/heads/master' }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Update Docker Hub description
+        uses: peter-evans/dockerhub-description@v5
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          repository: dockette/ci
diff --git a/Makefile b/Makefile
index b4adeda..700e94c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,9 @@
 DOCKER_IMAGE?=dockette/ci
 DOCKER_PLATFORM?=linux/amd64
+DOCKER_BUILD_OUTPUT?=--load
+PHP_TEST_TAG?=php84
+NODE_TEST_TAG?=node24
+ANSIBLE_TEST_TAG?=ansitest
 
 _docker-build-%: VERSION=$*
 _docker-build-%:
@@ -7,9 +11,22 @@ _docker-build-%:
 		build \
 		--platform ${DOCKER_PLATFORM} \
 		--pull \
+		${DOCKER_BUILD_OUTPUT} \
 		-t ${DOCKER_IMAGE}:${VERSION} \
 		./${VERSION}
 
+build: build-php-8.4 build-node24 build-ansitest
+
+test: build
+	docker run --rm ${DOCKER_IMAGE}:${PHP_TEST_TAG} php -v
+	docker run --rm ${DOCKER_IMAGE}:${PHP_TEST_TAG} composer --version
+	docker run --rm ${DOCKER_IMAGE}:${NODE_TEST_TAG} node --version
+	docker run --rm ${DOCKER_IMAGE}:${NODE_TEST_TAG} npm --version
+	docker run --rm ${DOCKER_IMAGE}:${ANSIBLE_TEST_TAG} ansible --version
+
+run:
+	docker run -it --rm -v $$(pwd):/srv ${DOCKER_IMAGE}:${PHP_TEST_TAG}
+
 build-php-5.6: _docker-build-php56
 build-php-7.0: _docker-build-php70
 build-php-7.1: _docker-build-php71
@@ -40,4 +57,4 @@ build-node22: _docker-build-node22
 build-node23: _docker-build-node23
 build-node24: _docker-build-node24
 
-build-ansitest: _docker-build-ansitest
\ No newline at end of file
+build-ansitest: _docker-build-ansitest
diff --git a/README.md b/README.md
index 67289bc..ccb734c 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,10 @@
 </p>
 
 <p align=center>
-  <a href="https://hub.docker.com/r/dockette/ci/"><img src="https://badgen.net/docker/pulls/dockette/ci"></a>
-  <a href="https://bit.ly/ctteg"><img src="https://badgen.net/badge/support/gitter/cyan"></a>
-  <a href="https://github.com/sponsors/f3l1x"><img src="https://badgen.net/badge/sponsor/donations/F96854"></a>
+   <a href="https://github.com/dockette/ci/actions"><img src="https://github.com/dockette/ci/actions/workflows/docker.yml/badge.svg" alt="GitHub Actions"></a>
+   <a href="https://hub.docker.com/r/dockette/ci"><img src="https://img.shields.io/docker/pulls/dockette/ci.svg" alt="Docker Hub pulls"></a>
+   <a href="https://github.com/sponsors/f3l1x"><img src="https://img.shields.io/badge/sponsor-GitHub%20Sponsors-ea4aaa" alt="GitHub Sponsors"></a>
+   <a href="https://github.com/orgs/dockette/discussions"><img src="https://img.shields.io/badge/support-discussions-6f42c1" alt="Support/Discussions"></a>
 </p>
 
 <p align=center>
@@ -127,7 +128,6 @@ docker run -it --rm -v $(pwd):/srv dockette/ci:node10
 
 -----
 
-Consider to [support](https://github.com/sponsors/f3l1x) **f3l1x**. Also thank you for using this package.
-
 ## Maintenance
+
 See [how to contribute](https://github.com/dockette/.github/blob/master/CONTRIBUTING.md) to this package. Consider to [support](https://github.com/sponsors/f3l1x) **f3l1x**. Thank you for using this package.