@stacksjs/ts-cloud 0.4.0 → 0.4.2

package/dist/index.js

@@ -48,7 +48,7 @@ import { readFileSync as readFileSync5 } from "node:fs";
 import { dirname as dirname42, join as join8 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 import { execFileSync as execFileSync2 } from "node:child_process";
-import { existsSync as existsSync52, mkdtempSync as mkdtempSync3, readdirSync as readdirSync52, readFileSync as readFileSync6, rmSync as rmSync3, statSync as statSync32, writeFileSync as writeFileSync52 } from "node:fs";
+import { existsSync as existsSync52, mkdirSync as mkdirSync22, mkdtempSync as mkdtempSync3, readdirSync as readdirSync52, readFileSync as readFileSync6, rmSync as rmSync3, statSync as statSync32, writeFileSync as writeFileSync52 } from "node:fs";
 import { tmpdir as tmpdir3 } from "node:os";
 import { join as join9, relative as relative22 } from "node:path";
 import { execSync as execSync2 } from "node:child_process";
@@ -26343,13 +26343,18 @@ function phpLayerBuildStage(phpVersion, asName) {
   const scl = `php${phpVersion.replace(".", "")}`;
   const packages = phpLayerPackages(phpVersion).join(" \\\n      ");
   const sclRoot = `/opt/remi/${scl}/root`;
-  const from = asName ? `FROM amazonlinux:2023 AS ${asName}` : "FROM amazonlinux:2023";
+  const sclEtc = `/etc/opt/remi/${scl}`;
+  const from = asName ? `FROM almalinux:9 AS ${asName}` : "FROM almalinux:9";
   return `${from}
 
-# Remi provides version-isolated PHP SCL packages for EL9 (AL2023 compatible).
-RUN dnf -y install dnf-plugins-core 'dnf-command(config-manager)' && \\
+# Build PHP on AlmaLinux 9 (where Remi's version-isolated SCL packages install
+# cleanly — Remi's release RPM rejects Amazon Linux 2023). AlmaLinux 9 shares
+# glibc 2.34 with the provided.al2023 Lambda runtime, and the relocation step
+# below bundles every non-glibc shared lib under /opt/php/lib, so the resulting
+# /opt tree runs on Lambda's provided.al2023.
+RUN dnf -y install epel-release dnf-plugins-core 'dnf-command(config-manager)' && \\
+    dnf config-manager --set-enabled crb && \\
     dnf -y install https://rpms.remirepo.net/enterprise/remi-release-9.rpm && \\
-    dnf -y update && \\
     dnf -y install \\
       ${packages} \\
       findutils tar gzip && \\
@@ -26362,7 +26367,10 @@ RUN set -eux; \\
     cp ${sclRoot}/usr/sbin/php-fpm /opt/php/sbin/php-fpm; \\
     EXT_DIR="$(${sclRoot}/usr/bin/php -r 'echo ini_get("extension_dir");')"; \\
     cp -a "$EXT_DIR"/*.so /opt/php/lib/php/modules/ || true; \\
-    cp -a ${sclRoot}/etc/php.d/*.ini /opt/php/etc/php.d/ 2>/dev/null || true; \\
+    cp -a ${sclEtc}/php.d/*.ini /opt/php/etc/php.d/ 2>/dev/null || true; \\
+    # Rewrite any absolute extension/zend_extension paths to bare names so they
+    # resolve against the relocated extension_dir.
+    sed -i -E "s#(zend_)?extension *= *.*/([^/]+\\.so)#\\1extension=\\2#" /opt/php/etc/php.d/*.ini 2>/dev/null || true; \\
     # Copy shared-library dependencies of php, php-fpm, and the extension modules.
     for bin in /opt/php/bin/php /opt/php/sbin/php-fpm /opt/php/lib/php/modules/*.so; do \\
       ldd "$bin" 2>/dev/null | awk '/=>/{print $3}/ld-linux/{print $1}' | sort -u | while read -r lib; do \\
@@ -26370,10 +26378,9 @@ RUN set -eux; \\
       done; \\
     done
 
-# Point PHP at the relocated config + extension dir.
+# Build the relocated main php.ini: extension_dir + every per-extension directive.
 RUN printf 'extension_dir=/opt/php/lib/php/modules\\n' > /opt/php/etc/php.ini && \\
     cat /opt/php/etc/php.d/*.ini >> /opt/php/etc/php.ini 2>/dev/null || true
-ENV PHP_INI_SCAN_DIR=/opt/php/etc/php.d
 
 # Runtime assets (bootstrap, runtime loops, fpm config) are added by the build
 # orchestrator after the image is produced. Export /opt as the layer payload.
@@ -26456,8 +26463,7 @@ function buildBunRuntimeLayerZip(options) {
   const step = options.onStep ?? (() => {});
   const stage = mkdtempSync2(join72(tmpdir2(), "tscloud-bun-layer-"));
   try {
-    const tag = version2 ? `bun-v${version2}` : "latest";
-    const url = `https://github.com/oven-sh/bun/releases/download/${tag}/${bunArch}.zip`;
+    const url = version2 ? `https://github.com/oven-sh/bun/releases/download/bun-v${version2}/${bunArch}.zip` : `https://github.com/oven-sh/bun/releases/latest/download/${bunArch}.zip`;
     step(`downloading Bun ${version2 || "latest"} (${architecture})`);
     const zipPath = join72(stage, "bun.zip");
     fetchToFile(url, zipPath);
@@ -26686,16 +26692,17 @@ function buildPhpRuntimeLayerZip(options = {}) {
     writeFileSync52(join9(stage, "Dockerfile"), generatePhpLayerDockerfile(options));
     step("Building PHP runtime image (docker)");
     execFileSync2("docker", ["build", "--platform", platform, "-t", imageTag, stage], { stdio: "inherit" });
-    step("Extracting /opt from image");
+    step("Extracting /opt/php from image");
     const cid = execFileSync2("docker", ["create", "--platform", platform, imageTag], { encoding: "utf-8" }).trim();
     const optDir = join9(stage, "opt");
+    mkdirSync22(optDir, { recursive: true });
     try {
-      execFileSync2("docker", ["cp", `${cid}:/opt/.`, optDir], { stdio: "inherit" });
+      execFileSync2("docker", ["cp", `${cid}:/opt/php`, join9(optDir, "php")], { stdio: "inherit" });
     } finally {
       execFileSync2("docker", ["rm", cid], { stdio: "ignore" });
     }
-    if (!existsSync52(optDir))
-      throw new Error("layer build produced no /opt directory");
+    if (!existsSync52(join9(optDir, "php", "bin", "php")))
+      throw new Error("layer build produced no /opt/php/bin/php");
     const entries = [];
     for (const file of walk(optDir)) {
       const rel = relative22(optDir, file).replace(/\\/g, "/");
@@ -45735,6 +45742,7 @@ async function sendFallbackSms(to, message) {
   PHP_LAYER_EXTENSIONS = [
     "cli",
     "fpm",
+    "curl",
     "mbstring",
     "xml",
     "pdo",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/ts-cloud",
   "type": "module",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "A lightweight, performant infrastructure-as-code library and CLI for deploying both server-based (EC2) and serverless applications.",
   "author": "Chris Breuer <chris@stacksjs.com>",
   "license": "MIT",
@@ -89,8 +89,8 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@ts-cloud/aws-types": "0.4.0",
-    "@ts-cloud/core": "0.4.0",
+    "@ts-cloud/aws-types": "0.4.2",
+    "@ts-cloud/core": "0.4.2",
     "@stacksjs/ts-xml": "^0.1.0"
   },
   "devDependencies": {