Remove ios image, superseded by appleembedded + misc edits

Author: akien-mga

Dockerfile.appleembedded

@@ -1,5 +1,5 @@
 ARG img_version
-FROM godot-osx:${img_version} as builder
+FROM godot-osx:${img_version}
 
 RUN dnf -y install --setopt=install_weak_deps=False \
       automake autoconf gcc gcc-c++ gcc-objc gcc-objc++ cmake libicu-devel libtool libxml2-devel openssl-devel perl python yasm
@@ -8,15 +8,15 @@ ENV IOS_SDK=18.5
 ENV TVOS_SDK=18.5
 ENV XROS_SDK=2.5
 
-# Extract the SDKs for ios, tvos and xros, including the simulator SDKs
+# Extract the SDKs for iOS, tvOS and XROS, including the simulator SDKs
 # into separate layers, so this work is not repeated each time the image is built.
 RUN mkdir -p /root/SDKs
-RUN cd /root/SDKs && xz -dc /root/files/iPhoneOS${IOS_SDK}.sdk.tar.xz | tar xf -
-RUN cd /root/SDKs && xz -dc /root/files/iPhoneSimulator${IOS_SDK}.sdk.tar.xz | tar xf -
-RUN cd /root/SDKs && xz -dc /root/files/AppleTVOS${TVOS_SDK}.sdk.tar.xz | tar xf -
-RUN cd /root/SDKs && xz -dc /root/files/AppleTVSimulator${TVOS_SDK}.sdk.tar.xz | tar xf -
-RUN cd /root/SDKs && xz -dc /root/files/XROS${XROS_SDK}.sdk.tar.xz | tar xf -
-RUN cd /root/SDKs && xz -dc /root/files/XRSimulator${XROS_SDK}.sdk.tar.xz | tar xf -
+RUN cd /root/SDKs && tar xf /root/files/iPhoneOS${IOS_SDK}.sdk.tar.xz
+RUN cd /root/SDKs && tar xf /root/files/iPhoneSimulator${IOS_SDK}.sdk.tar.xz
+RUN cd /root/SDKs && tar xf /root/files/AppleTVOS${TVOS_SDK}.sdk.tar.xz
+RUN cd /root/SDKs && tar xf /root/files/AppleTVSimulator${TVOS_SDK}.sdk.tar.xz
+RUN cd /root/SDKs && tar xf /root/files/XROS${XROS_SDK}.sdk.tar.xz
+RUN cd /root/SDKs && tar xf /root/files/XRSimulator${XROS_SDK}.sdk.tar.xz
 
 RUN git clone --depth 1 --no-checkout https://github.com/tpoechtrager/cctools-port.git && \
     cd /root/cctools-port && \
@@ -46,7 +46,6 @@ RUN PATH=/root/ioscross/arm64/bin:$PATH /root/files/appleembedded/check-arm.sh
 
 ENV OSXCROSS_IOS=not_nothing
 ENV OSXCROSS_TVOS=not_nothing
-ENV OSXCROSS_XROS=not_nothing
 ENV OSXCROSS_VISIONOS=not_nothing
 ENV OSXCROSS_APPLEEMBEDDED=not_nothing
 

Dockerfile.ios

@@ -17,4 +17,4 @@ ENV VISIONOS_SDKV=
 COPY extract_xcode_sdks.sh /root/extract_xcode_sdks.sh
 RUN chmod +x /root/extract_xcode_sdks.sh
 
-CMD ["/root/extract_xcode_sdks.sh"]
+CMD /root/extract_xcode_sdks.sh

Dockerfile.xcode

@@ -73,7 +73,6 @@ These are the expected container image sizes, so you can plan your disk usage in
     localhost/godot-web                4.5-f42            2.35 GB
     localhost/godot-android            4.5-f42            4.19 GB
     localhost/godot-osx                4.5-f42            5.30 GB
-    localhost/godot-ios                4.5-f42            6.11 GB
     localhost/godot-appleembedded      4.5-f42            14.1 GB
 
 In addition to this, generating containers will also require some host disk space
@@ -94,5 +93,4 @@ These are the toolchains currently in use for Godot 4.3 and later:
 - Android: Android NDK 28.1.13356709, build-tools 35.0.0, platform android-35, CMake 3.31.6, JDK 21
 - Apple: Xcode 16.4 with Apple Clang (LLVM 19.1.4), cctools 1024.3, ld64 955.13
   * macOS: MacOSX SDK 15.5
-  * iOS: iPhoneOS SDK 18.5
-  * appleembedded: iPhoneOS SDK 18.5, iPhoneOS Simulator SDK 18.5, AppleTVOS SDK 18.5, AppleTVOS Simulator SDK 18.5, XROS SDK 2.5, XROS Simulator SDK 2.5
+  * Apple Embedded: iPhoneOS and iPhoneSimulator SDKs 18.5, AppleTVOS and AppleTVSimulator SDKs 18.5, XROS and XRSimulator SDKs 2.5

README.md

@@ -73,7 +73,7 @@ if [ ! -e "${files_root}"/MacOSX${OSX_SDK}.sdk.tar.xz ] || [ ! -e "${files_root}
     exit 1
   fi
 
-  echo "Extracting Apple SDK packages. This will take a while"
+  echo "Extracting Apple SDK packages. This will take a while."
   podman_build xcode
   "$podman" run -it --rm \
     -v "${files_root}":/root/files:z \
@@ -87,5 +87,4 @@ if [ ! -e "${files_root}"/MacOSX${OSX_SDK}.sdk.tar.xz ] || [ ! -e "${files_root}
 fi
 
 podman_build osx
-podman_build ios
 podman_build appleembedded

build.sh

@@ -51,17 +51,17 @@ extract_and_pack() {
   local sdk_name="$2"
   local versioned_name="$3"
   local tar_name="$4"
-  
+
   if [[ -d "$sdk_dir/$sdk_name" ]]; then
 
     # Use tar to copy and preserve everything, then repackage
     echo "=== Copying SDK using tar to preserve special files ==="
     cd "$sdk_dir"
     tar -cf - "$sdk_name" | (cd "/tmp" && tar -xf -)
-    
+
     # Rename to versioned name
     mv "/tmp/$sdk_name" "/tmp/$versioned_name"
-    
+
     # Verify SDKSettings.json exists and has content
     if [[ -f "/tmp/$versioned_name/SDKSettings.json" ]]; then
       echo "=== SDKSettings.json found, size: $(wc -c < "/tmp/$versioned_name/SDKSettings.json") bytes ==="
@@ -71,13 +71,13 @@ extract_and_pack() {
     else
       echo "⚠️  Warning: SDKSettings.json not found in extracted SDK"
     fi
-    
+
     # Create tar with versioned directory name
     tar -cJf "$OUT_DIR/$tar_name" -C "/tmp" "$versioned_name"
-    
+
     # Clean up temporary directory
     rm -rf "/tmp/$versioned_name"
-    
+
     echo "✓ Packed $tar_name"
   else
     echo "✗ SDK not found: $sdk_dir/$sdk_name"
@@ -148,4 +148,4 @@ if [[ "$EXTRACT_VISIONOS_SIM" == "1" ]]; then
     "XRSimulator${VISIONOS_SDKV}.sdk.tar.xz"
 fi
 
-echo "Done extracting selected SDKs."
+echo "Done extracting selected SDKs."

extract_xcode_sdks.sh

@@ -21,6 +21,5 @@ fi
 "$podman" push godot-xcode:${img_version} ${registry}/godot/xcode
 
 "$podman" push godot-android:${img_version} ${registry}/godot-private/android
-"$podman" push godot-ios:${img_version} ${registry}/godot-private/ios
 "$podman" push godot-osx:${img_version} ${registry}/godot-private/macosx
 "$podman" push godot-appleembedded:${img_version} ${registry}/godot-private/appleembedded