From 7b53893d02f7c3ee8d8c2f5b0c83d91a4e45fa79 Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Wed, 29 Apr 2026 14:39:56 +0530
Subject: [PATCH 1/2] Restore git binary in final runtime image
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Dropped from the apk install list in 1.2.0 (#66) during the size-reduction
refactor. Other binaries removed in that same diff (rsync, zip, imagemagick,
certbot, docker-cli) are still provided by the phpswoole/swoole base image,
but git is not — so it actually disappeared from the final image and broke
VCS-dependent services.

Adds a container-structure-test so a future regression is caught.
---
 CHANGES.md | 10 ++++++++++
 Dockerfile |  1 +
 tests.yaml |  4 ++++
 3 files changed, 15 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 5514883..185cc10 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## Version 1.2.1
+
+### Fix
+
+* Restore `git` in final image — unintentionally dropped from runtime apk install in 1.2.0; required by VCS-dependent services
+
+### Add
+
+* container-structure-test for `git` command
+
 ## Version 1.2.0
 
 ### Add
diff --git a/Dockerfile b/Dockerfile
index 2055b48..99f90c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -194,6 +194,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && \
     freetype \
     docker-cli \
     docker-cli-compose \
+    git \
     icu-libs \
     imagemagick \
     imagemagick-heic \
diff --git a/tests.yaml b/tests.yaml
index aa50095..6bc66c0 100644
--- a/tests.yaml
+++ b/tests.yaml
@@ -21,6 +21,10 @@ commandTests:
     command: "docker"
     args: ["compose", "version"]
     expectedOutput: ["Docker Compose version v.*"]
+  - name: 'Git command'
+    command: "git"
+    args: ["--version"]
+    expectedOutput: ["git version 2.*"]
   - name: 'PHP modules'
     command: "php"
     args: ["-m"]

From 0f9eb06bf0d039612e8c81b36c00ace4077ccb82 Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Wed, 29 Apr 2026 14:55:45 +0530
Subject: [PATCH 2/2] Bump PHP/Swoole version assertions in tests.yaml

Upstream phpswoole/swoole:php8.5-alpine moved to PHP 8.5.5 / Swoole 6.2.1,
which broke the pinned assertions. The git apk add change is unrelated to
these failures.
---
 CHANGES.md | 5 +++++
 tests.yaml | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 185cc10..b2d5417 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,11 @@
 
 * container-structure-test for `git` command
 
+### Change
+
+* `tests.yaml` PHP assertion bumped to 8.5.5 (upstream `phpswoole/swoole:php8.5-alpine` update)
+* `tests.yaml` Swoole assertion bumped to 6.2.1
+
 ## Version 1.2.0
 
 ### Add
diff --git a/tests.yaml b/tests.yaml
index 6bc66c0..e14e737 100644
--- a/tests.yaml
+++ b/tests.yaml
@@ -92,7 +92,7 @@ commandTests:
     command: "php"
     args: ["-v"]
     expectedOutput:
-      - "PHP 8.5.4 (cli)*"
+      - "PHP 8.5.5 (cli)*"
   - name: 'ImageMagick supported formats'
     command: "php"
     args: ["-i"]
@@ -107,7 +107,7 @@ commandTests:
     command: "php"
     args: ["--re", "swoole"]
     expectedOutput:
-      - ".*version 6.2.0.*"
+      - ".*version 6.2.1.*"
   - name: 'ZIP'
     command: "zip"
     args: ["-v"]