Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
8 changes: 6 additions & 2 deletions tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down Expand Up @@ -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"]
Expand All @@ -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"]
Expand Down
Loading