fix: use TARGETARCH instead of TARGETPLATFORM in user Dockerfiles (dd…

…ev#6711)
ddev-test · Nov 12, 2024 · eb5f29d · eb5f29d
1 parent a340e88
commit eb5f29d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pkg/ddevapp/config.go b/pkg/ddevapp/config.go
@@ -985,8 +985,8 @@ ENV N_INSTALL_VERSION="%s"
 ### Drupal 11+ requires a minimum sqlite3 version (3.45 currently)
 ARG SQLITE_VERSION=%s
 RUN log-stderr.sh bash -c "mkdir -p /tmp/sqlite3 && \
-wget -O /tmp/sqlite3/sqlite3.deb https://snapshot.debian.org/archive/debian/20240203T152533Z/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETPLATFORM##linux/}.deb && \
-wget -O /tmp/sqlite3/libsqlite3.deb https://snapshot.debian.org/archive/debian/20240203T152533Z/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETPLATFORM##linux/}.deb && \
+wget -O /tmp/sqlite3/sqlite3.deb https://snapshot.debian.org/archive/debian/20240203T152533Z/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETARCH}.deb && \
+wget -O /tmp/sqlite3/libsqlite3.deb https://snapshot.debian.org/archive/debian/20240203T152533Z/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETARCH}.deb && \
 apt-get install -y /tmp/sqlite3/*.deb && \
 rm -rf /tmp/sqlite3" || true
 			`, versionconstants.Drupal11RequiredSqlite3Version)
@@ -1139,7 +1139,7 @@ RUN (groupadd --gid $gid "$username" || groupadd "$username" || true) && (userad
 		if _, ok := nodeps.PreinstalledPHPVersions[app.PHPVersion]; !ok {
 			contents = contents + fmt.Sprintf(`
 ### DDEV-injected addition of not-preinstalled PHP version
-RUN /usr/local/bin/install_php_extensions.sh "php%s" "${TARGETPLATFORM#linux/}"
+RUN /usr/local/bin/install_php_extensions.sh "php%s" "${TARGETARCH}"
 	`, app.PHPVersion)
 		}
 	}