diff --git a/CHANGES.md b/CHANGES.md index 5514883..b2d5417 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,20 @@ # 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 + +### 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/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..e14e737 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"] @@ -88,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"] @@ -103,7 +107,7 @@ commandTests: command: "php" args: ["--re", "swoole"] expectedOutput: - - ".*version 6.2.0.*" + - ".*version 6.2.1.*" - name: 'ZIP' command: "zip" args: ["-v"]