fix verify script

Author: willwang-openai

Dockerfile

@@ -57,8 +57,6 @@ RUN apt-get update \
         openssh-client=1:9.6p1-* \
         pkg-config=1.8.* \
         protobuf-compiler=3.21.* \
-        python3=3.12.* \
-        python3-pip=24.* \
         ripgrep=14.1.* \
         rsync=3.2.* \
         software-properties-common=0.99.* \
@@ -79,11 +77,9 @@ RUN apt-get update \
 ### MISE ###
 
 RUN install -dm 0755 /etc/apt/keyrings \
-    && curl -fsSL https://mise.jdx.dev/gpg-key.pub \
-       | gpg --batch --yes --dearmor -o /etc/apt/keyrings/mise-archive-keyring.gpg \
+    && curl -fsSL https://mise.jdx.dev/gpg-key.pub | gpg --batch --yes --dearmor -o /etc/apt/keyrings/mise-archive-keyring.gpg \
     && chmod 0644 /etc/apt/keyrings/mise-archive-keyring.gpg \
-    && echo "deb [signed-by=/etc/apt/keyrings/mise-archive-keyring.gpg] https://mise.jdx.dev/deb stable main" \
-       > /etc/apt/sources.list.d/mise.list \
+    && echo "deb [signed-by=/etc/apt/keyrings/mise-archive-keyring.gpg] https://mise.jdx.dev/deb stable main" > /etc/apt/sources.list.d/mise.list \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends mise/stable \
     && rm -rf /var/lib/apt/lists/* \
@@ -273,7 +269,7 @@ RUN chmod +x /opt/codex/setup_universal.sh
 ### VERIFICATION SCRIPT ###
 
 COPY verify.sh /opt/verify.sh
-RUN chmod +x /opt/verify.sh && bash -lc /opt/verify.sh
+RUN chmod +x /opt/verify.sh && bash -lc "TARGETARCH=$TARGETARCH /opt/verify.sh"
 
 ### ENTRYPOINT ###
 

README.md

@@ -15,11 +15,11 @@ docker pull ghcr.io/openai/codex-universal:latest
 ```
 
 This repository builds the image for both linux/amd64 and linux/arm64. However we only run the linux/amd64 version.
-Your installed Docker may support linux/amd64 emulation by passing the `--platform linux/amd64` flag. 
+Your installed Docker may support linux/amd64 emulation by passing the `--platform linux/amd64` flag.
 
-The arm64 differs from the amd64 image in 2 ways:
+The arm64 image differs from the amd64 image in 2 ways:
 - OpenJDK 10 is not available on amd64
-- The arm64 image skips install swift because of a current bug with mise
+- The arm64 image skips installing swift because of a current bug with mise
 
 The below script shows how can you approximate the `setup` environment in Codex:
 

verify.sh

@@ -27,8 +27,10 @@ javac -version
 gradle --version | head -n 3
 mvn --version | head -n 1
 
-echo "- Swift:"
-swift --version
+if [ "$TARGETARCH" = "amd64" ]; then \
+    echo "- Swift:"
+    swift --version
+fi
 
 echo "- Ruby:"
 ruby --version