From ee309ef0e1559ee7bddbbccc484caeb5799fd5f7 Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Wed, 12 Aug 2026 21:49:25 +1200 Subject: [PATCH] chore: lock the released DAT-2310 packages instead of patching vendor The Dockerfile cloned utopia-php/monorepo, database and mongo at fixed commits and copied their src/ over vendor/, driven by four build args pinned in ci.yml. Meanwhile composer.lock still resolved the OLD versions: cache 4.0.1 database 7.1.3 http 2.0.0-rc21 mongo 1.5.1 So the fix lived only inside the CI image. A release cut from this branch would have shipped unfixed dependencies while its own CI stayed green. All four releases now exist and each contains the commit it was pinned to, so the lock resolves them and the machinery goes: cache 4.0.1 -> 4.0.2 source 92e02dab6 database 7.1.3 -> 7.1.4 source b2b136a38 http 2.0.0-rc21 -> 2.0.0-rc22 source cc791f56b mongo 1.5.1 -> 1.5.2 source 20f9a644a Every reference equals the Packagist source reference exactly. No package was added or removed: 25 lines changed, no new entries. Constraints already admitted these (cache ^4.0.0, database ^7.0.0, http ^2.0@RC, mongo transitively), so only the lock moved. Removing the build args also stops a Docker build fetching arbitrary external git refs. Co-Authored-By: Claude Opus 5 --- .github/workflows/ci.yml | 4 ---- Dockerfile | 30 +----------------------- composer.lock | 50 ++++++++++++++++++++-------------------- 3 files changed, 26 insertions(+), 58 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6de39542d7..d8b6be61b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -288,10 +288,6 @@ jobs: build-args: | DEBUG=false TESTING=true - UTOPIA_CACHE_REFERENCE=d7c0806f9bbdafee794849398f65e8ece322711d - UTOPIA_DATABASE_REFERENCE=74d9af59947d1f3c6998fb23715bf2d8f1cf4e0b - UTOPIA_HTTP_REFERENCE=b6747451178c2f9581e5ee6e34a6de1bdfabed4d - UTOPIA_MONGO_REFERENCE=daea8f8213c33f52e8b66d0f5366428bf2f5a4b8 VERSION=dev unit: diff --git a/Dockerfile b/Dockerfile index f3bce5390b..ea39e616f6 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,6 @@ FROM composer:2 AS composer ARG TESTING=false -ARG UTOPIA_CACHE_REFERENCE='' -ARG UTOPIA_DATABASE_REFERENCE='' -ARG UTOPIA_HTTP_REFERENCE='' -ARG UTOPIA_MONGO_REFERENCE='' ENV TESTING=$TESTING WORKDIR /usr/local/src/ @@ -14,31 +10,7 @@ COPY composer.json /usr/local/src/ RUN composer install --ignore-platform-reqs --optimize-autoloader \ --no-plugins --no-scripts --prefer-dist \ - `if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi` \ - && if [ -n "$UTOPIA_CACHE_REFERENCE" ] || [ -n "$UTOPIA_DATABASE_REFERENCE" ] || [ -n "$UTOPIA_HTTP_REFERENCE" ] || [ -n "$UTOPIA_MONGO_REFERENCE" ]; then \ - test -n "$UTOPIA_CACHE_REFERENCE" \ - && test -n "$UTOPIA_DATABASE_REFERENCE" \ - && test -n "$UTOPIA_HTTP_REFERENCE" \ - && test -n "$UTOPIA_MONGO_REFERENCE" \ - && git init /tmp/utopia-monorepo \ - && git -C /tmp/utopia-monorepo remote add origin https://github.com/utopia-php/monorepo.git \ - && git -C /tmp/utopia-monorepo fetch --depth 1 origin "$UTOPIA_CACHE_REFERENCE" \ - && git -C /tmp/utopia-monorepo checkout --detach FETCH_HEAD \ - && cp -R /tmp/utopia-monorepo/packages/cache/src/. vendor/utopia-php/cache/src/ \ - && git -C /tmp/utopia-monorepo fetch --depth 1 origin "$UTOPIA_HTTP_REFERENCE" \ - && git -C /tmp/utopia-monorepo checkout --detach FETCH_HEAD \ - && cp -R /tmp/utopia-monorepo/packages/http/src/. vendor/utopia-php/http/src/ \ - && git init /tmp/utopia-database \ - && git -C /tmp/utopia-database remote add origin https://github.com/utopia-php/database.git \ - && git -C /tmp/utopia-database fetch --depth 1 origin "$UTOPIA_DATABASE_REFERENCE" \ - && git -C /tmp/utopia-database checkout --detach FETCH_HEAD \ - && cp -R /tmp/utopia-database/src/. vendor/utopia-php/database/src/ \ - && git init /tmp/utopia-mongo \ - && git -C /tmp/utopia-mongo remote add origin https://github.com/utopia-php/mongo.git \ - && git -C /tmp/utopia-mongo fetch --depth 1 origin "$UTOPIA_MONGO_REFERENCE" \ - && git -C /tmp/utopia-mongo checkout --detach FETCH_HEAD \ - && cp -R /tmp/utopia-mongo/src/. vendor/utopia-php/mongo/src/; \ - fi + `if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi` FROM appwrite/base:2.0.0 AS base diff --git a/composer.lock b/composer.lock index f960ddbd42..1841e42ac4 100644 --- a/composer.lock +++ b/composer.lock @@ -3272,16 +3272,16 @@ }, { "name": "utopia-php/cache", - "version": "4.0.1", + "version": "4.0.2", "source": { "type": "git", "url": "https://github.com/utopia-php/cache.git", - "reference": "6f8cb03a5cb76e95b95a05103cd14cf782b8060f" + "reference": "92e02dab63606234b993b841ebf4c58845dd4620" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/cache/zipball/6f8cb03a5cb76e95b95a05103cd14cf782b8060f", - "reference": "6f8cb03a5cb76e95b95a05103cd14cf782b8060f", + "url": "https://api.github.com/repos/utopia-php/cache/zipball/92e02dab63606234b993b841ebf4c58845dd4620", + "reference": "92e02dab63606234b993b841ebf4c58845dd4620", "shasum": "" }, "require": { @@ -3325,9 +3325,9 @@ ], "support": { "issues": "https://github.com/utopia-php/cache/issues", - "source": "https://github.com/utopia-php/cache/tree/4.0.1" + "source": "https://github.com/utopia-php/cache/tree/4.0.2" }, - "time": "2026-08-04T00:06:02+00:00" + "time": "2026-08-12T07:48:59+00:00" }, { "name": "utopia-php/circuit-breaker", @@ -3638,16 +3638,16 @@ }, { "name": "utopia-php/database", - "version": "7.1.3", + "version": "7.1.4", "source": { "type": "git", "url": "https://github.com/utopia-php/database.git", - "reference": "ce4e14e11cf8f9e6897015d5a7f8bb44a4b74949" + "reference": "b2b136a3827ccee2ea4eb83626348db4992286e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/database/zipball/ce4e14e11cf8f9e6897015d5a7f8bb44a4b74949", - "reference": "ce4e14e11cf8f9e6897015d5a7f8bb44a4b74949", + "url": "https://api.github.com/repos/utopia-php/database/zipball/b2b136a3827ccee2ea4eb83626348db4992286e1", + "reference": "b2b136a3827ccee2ea4eb83626348db4992286e1", "shasum": "" }, "require": { @@ -3692,9 +3692,9 @@ ], "support": { "issues": "https://github.com/utopia-php/database/issues", - "source": "https://github.com/utopia-php/database/tree/7.1.3" + "source": "https://github.com/utopia-php/database/tree/7.1.4" }, - "time": "2026-08-10T12:17:57+00:00" + "time": "2026-08-12T09:39:29+00:00" }, { "name": "utopia-php/detector", @@ -4058,16 +4058,16 @@ }, { "name": "utopia-php/http", - "version": "2.0.0-rc21", + "version": "2.0.0-rc22", "source": { "type": "git", "url": "https://github.com/utopia-php/http.git", - "reference": "9d8d374926dd2d3c35808deb72199ab943355d64" + "reference": "cc791f56bfa1114d8e5c721f68eb4ad581140883" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/http/zipball/9d8d374926dd2d3c35808deb72199ab943355d64", - "reference": "9d8d374926dd2d3c35808deb72199ab943355d64", + "url": "https://api.github.com/repos/utopia-php/http/zipball/cc791f56bfa1114d8e5c721f68eb4ad581140883", + "reference": "cc791f56bfa1114d8e5c721f68eb4ad581140883", "shasum": "" }, "require": { @@ -4105,9 +4105,9 @@ ], "support": { "issues": "https://github.com/utopia-php/http/issues", - "source": "https://github.com/utopia-php/http/tree/2.0.0-rc21" + "source": "https://github.com/utopia-php/http/tree/2.0.0-rc22" }, - "time": "2026-08-10T04:51:03+00:00" + "time": "2026-08-12T06:51:48+00:00" }, { "name": "utopia-php/image", @@ -4416,16 +4416,16 @@ }, { "name": "utopia-php/mongo", - "version": "1.5.1", + "version": "1.5.2", "source": { "type": "git", "url": "https://github.com/utopia-php/mongo.git", - "reference": "3ece830d1d72d2c9f68c656738e285629b5c72a9" + "reference": "20f9a644a356599fdd6265ba48696fc42a1f1881" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/mongo/zipball/3ece830d1d72d2c9f68c656738e285629b5c72a9", - "reference": "3ece830d1d72d2c9f68c656738e285629b5c72a9", + "url": "https://api.github.com/repos/utopia-php/mongo/zipball/20f9a644a356599fdd6265ba48696fc42a1f1881", + "reference": "20f9a644a356599fdd6265ba48696fc42a1f1881", "shasum": "" }, "require": { @@ -4471,9 +4471,9 @@ ], "support": { "issues": "https://github.com/utopia-php/mongo/issues", - "source": "https://github.com/utopia-php/mongo/tree/1.5.1" + "source": "https://github.com/utopia-php/mongo/tree/1.5.2" }, - "time": "2026-08-02T00:46:11+00:00" + "time": "2026-08-12T06:57:25+00:00" }, { "name": "utopia-php/platform", @@ -8439,5 +8439,5 @@ "platform-dev": { "ext-fileinfo": "*" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.9.0" }