more changes to swift, java

Author: willwang-openai

Dockerfile

@@ -96,16 +96,16 @@ ENV PATH=$HOME/.local/share/mise/shims:$PATH
 
 ### LLVM ###
 
-RUN install -dm 0755 /etc/apt/keyrings \
-    && curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key \
-       | gpg --batch --yes --dearmor -o /etc/apt/keyrings/llvm.gpg \
-    && chmod 0644 /etc/apt/keyrings/llvm.gpg \
-    && . /etc/os-release \
-    && echo "deb [signed-by=/etc/apt/keyrings/llvm.gpg] https://apt.llvm.org/${VERSION_CODENAME}/ llvm-toolchain-${VERSION_CODENAME}-20 main" \
-       > /etc/apt/sources.list.d/llvm.list \
-    && apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends clang-20 lld-20 lldb-20 llvm-20 \
-    && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        cmake=3.28.* \
+        ccache=4.9.* \
+        ninja-build=1.11.* \
+        nasm=2.16.* \
+        yasm=1.3.* \
+        gawk=1:5.2.* \
+        lsb-release=12.0-* \
+    && rm -rf /var/lib/apt/lists/* \
+    && bash -c "$(curl -fsSL https://apt.llvm.org/llvm.sh)"
 
 ### PYTHON ###
 
@@ -124,7 +124,7 @@ RUN git -c advice.detachedHead=0 clone --branch "$PYENV_VERSION" --depth 1 https
     && pyenv install $PYTHON_VERSIONS \
     && pyenv global "$PYTHON_VERSION"
 
-    # Install pipx for common global package managers (e.g. poetry)
+# Install pipx for common global package managers (e.g. poetry)
 ENV PIPX_BIN_DIR=/root/.local/bin
 ENV PATH=$PIPX_BIN_DIR:$PATH
 RUN apt-get update && apt-get install -y --no-install-recommends pipx=1.4.* \
@@ -170,24 +170,29 @@ RUN mise use --global "bun@${BUN_VERSION}"
 
 ARG GRADLE_VERSION=8.14
 ARG MAVEN_VERSION=3.9.10
-
 # OpenJDK 11 is not available for arm64. Codex Web only uses amd64 which
 # does support 11.
-RUN if [ "$TARGETARCH" = "arm64" ]; then \
-        JAVA_VERSIONS="21 17"; \
-    else \
-        JAVA_VERSIONS="21 17 11"; \
-    fi; \
-    for v in $JAVA_VERSIONS; do mise install "java@${v}"; done && \
-    mise use --global "java@${JAVA_VERSIONS%% *}" && \
-    mise use --global "gradle@${GRADLE_VERSION}" && \
-    mise use --global "maven@${MAVEN_VERSION}"
+ARG AMD_JAVA_VERSIONS="21 17 11"
+ARG ARM_JAVA_VERSIONS="21 17"
+
+RUN JAVA_VERSIONS="$( [ "$TARGETARCH" = "arm64" ] && echo "$ARM_JAVA_VERSIONS" || echo "$AMD_JAVA_VERSIONS" )" \
+    && for v in $JAVA_VERSIONS; do mise install "java@${v}"; done \
+    && mise use --global "java@${JAVA_VERSIONS%% *}" \
+    && mise use --global "gradle@${GRADLE_VERSION}" \
+    && mise use --global "maven@${MAVEN_VERSION}"
 
 ### SWIFT ###
 
 ARG SWIFT_VERSIONS="6.1 5.10.1"
-RUN for v in $SWIFT_VERSIONS; do mise install "swift@${v}"; done \
-    && mise use --global "swift@${SWIFT_VERSIONS%% *}"
+# mise currently broken for swift on ARM
+RUN if [ "$TARGETARCH" = "amd64" ]; then \
+      for v in $SWIFT_VERSIONS; do \
+        mise install "swift@${v}"; \
+      done && \
+      mise use --global "swift@${SWIFT_VERSIONS%% *}"; \
+    else \
+      echo "Skipping Swift install on $TARGETARCH"; \
+    fi
 
 ### RUST ###
 

README.md

@@ -17,6 +17,10 @@ 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. 
 
+The arm64 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 below script shows how can you approximate the `setup` environment in Codex:
 
 ```sh