Feedback corrections

Author: davidjeddy

.dive-ci .dive-ci.yml.dive-ci renamed to .dive-ci.yml

@@ -26,7 +26,7 @@ jobs:
             arch: arm64
     steps:
       - name: Checkout the repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v6.0.2
 
       - name: Login to DockerHub
         uses: docker/login-action@v4

.github/workflows/build-and-push.yml

@@ -23,4 +23,5 @@ jobs:
       - name: Dive
         uses: yuichielectric/dive-action@0.0.4
         with:
+          config-file: ${{ github.workspace }}/.dive-ci.yml
           image: '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}'

.github/workflows/dive.yml

@@ -18,13 +18,13 @@
 * Better document use of `docker buildx ...` for local builds
 * Better noted and organized the different build processes for PHP extensions
 * Date component of PHP extension shared objects directory now a build argument
+* Dockerfile base now based on `phpswoole/swoole:php8.5-alpine`
 * Dockerfile compile and final stage system packages aligned
-* Github action for container-structure-test now uses a marketplace action
-* Github action runners pinned to Ubuntu 24.04
-* ImageMagick version bumped to 7.1.2.15, tests.yaml aligned to ensure new version
-* PHP version bumped to 8.5.3
+* GitHub action for container-structure-test now uses a marketplace action
+* GitHub action runners pinned to Ubuntu 24.04
+* ImageMagick version bumped to 7.1.2.15 via APK
+* PHP version bumped to 8.5
 * Refactored multi-arch build process to prevent cross-arch builds requiring long wait times
-* Swoole version bumped to 6.2.0
 
 ### Fixes
 
@@ -35,4 +35,4 @@
 ### Removed
 
 * Build tools from final stage of Dockerfile
-* Github action to Setup QEMU as GitHub now provides native ARM runners
+* GitHub action to Setup QEMU as GitHub now provides native ARM runners

CHANGES.md

@@ -21,8 +21,8 @@ ENV \
 RUN \
   apk update && \
   apk upgrade && \
-  apk add --no-cache --virtual .deps && \
-  apk add --no-cache \
+  apk add --no-cache --virtual .deps \
+    && apk add --no-cache \
     autoconf \
     automake \
     brotli-dev \
@@ -185,7 +185,8 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && \
 RUN \
   apk update && \
   apk upgrade && \
-  apk add --no-cache \
+  apk add --no-cache --virtual .deps \
+    && apk add --no-cache \
     autoconf \
     automake \
     brotli-dev \

Dockerfile

@@ -53,7 +53,7 @@ trivy image --format json --pkg-types  os,library --severity  CRITICAL,HIGH --ou
 ```bash
 container-structure-test test --config tests.yaml --image appwrite/base:latest
 # PASS
-CI=true dive appwrite/base:latest
+CI=true dive --confog .dive-ci.yml appwrite/base:latest
 # Results:
 #   PASS: highestUserWastedPercent
 #   PASS: highestWastedBytes

README.md

@@ -2,5 +2,5 @@
 
 - can we get pre-compiled extensions *.so / extensions?
 - xdebug as separate image `appwrite/base:XYZ-xdebug`
-- Github action should only build the image once, cache it, the use it downstream. No need to build it in every job
+- GitHub action should only build the image once, cache it, the use it downstream. No need to build it in every job
   - https://stackoverflow.com/questions/75632970/how-to-use-docker-build-in-next-step-of-github-actions-after-build-step