Skip to content

Commit 7b53893

Browse files
committed
Restore git binary in final runtime image
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.
1 parent 726eec3 commit 7b53893

3 files changed

Lines changed: 15 additions & 0 deletions

File tree

CHANGES.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# CHANGELOG
22

3+
## Version 1.2.1
4+
5+
### Fix
6+
7+
* Restore `git` in final image — unintentionally dropped from runtime apk install in 1.2.0; required by VCS-dependent services
8+
9+
### Add
10+
11+
* container-structure-test for `git` command
12+
313
## Version 1.2.0
414

515
### Add

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && \
194194
freetype \
195195
docker-cli \
196196
docker-cli-compose \
197+
git \
197198
icu-libs \
198199
imagemagick \
199200
imagemagick-heic \

tests.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ commandTests:
2121
command: "docker"
2222
args: ["compose", "version"]
2323
expectedOutput: ["Docker Compose version v.*"]
24+
- name: 'Git command'
25+
command: "git"
26+
args: ["--version"]
27+
expectedOutput: ["git version 2.*"]
2428
- name: 'PHP modules'
2529
command: "php"
2630
args: ["-m"]

0 commit comments

Comments
 (0)