diff --git a/CHANGELOG.md b/CHANGELOG.md index eb4c8e3..b3924fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ ### v1.9.1 - Update OpenBLAS to v0.3.26 in `naev-windows`. +- Add rcodesign to `naev-macos` and `naev-release`. + - This is useful for signing macos binaries as well as app bundles. This is required for ARM64 and universal builds to work. ### v1.9.0 - `naev-macos`: Update SDK, merge aarch64 and x86_64 images. diff --git a/naev-macos/Dockerfile b/naev-macos/Dockerfile index a0ed4a4..7732fa9 100644 --- a/naev-macos/Dockerfile +++ b/naev-macos/Dockerfile @@ -65,12 +65,19 @@ RUN UNATTENDED=1 osxcross-macports install -arm64 freetype glpk libsdl2 libsdl2_ UNATTENDED=1 osxcross-macports clear-cache && \ mv /usr/lib/osxcross/macports /usr/lib/osxcross/macports.aarch64 +# Download and install rcodesign +RUN curl -L -O https://github.com/indygreg/apple-platform-rs/releases/download/apple-codesign%2F0.26.0/apple-codesign-0.26.0-x86_64-unknown-linux-musl.tar.gz && \ + mkdir -p /opt/apple-codesign && \ + tar --strip-components=1 -xvzf apple-codesign-0.26.0-x86_64-unknown-linux-musl.tar.gz -C /opt/apple-codesign && \ + rm apple-codesign-0.26.0-x86_64-unknown-linux-musl.tar.gz + # Build final container FROM registry.fedoraproject.org/fedora-minimal:latest WORKDIR / COPY --from=build /usr/lib/osxcross /usr/lib/osxcross COPY --from=build /usr/local/bin/dmg /usr/bin +COPY --from=build /opt/apple-codesign/rcodesign /usr/bin COPY macports-configure.sh /usr/bin LABEL org.opencontainers.image.authors "Naev Dev Team" diff --git a/naev-release/Dockerfile b/naev-release/Dockerfile index 5a1cea3..84abfda 100644 --- a/naev-release/Dockerfile +++ b/naev-release/Dockerfile @@ -34,6 +34,9 @@ ENV PATH "$PATH:/opt/steamcmd" # Add Butler to PATH ENV PATH "$PATH:/opt/butler" +# Add Butler to PATH +ENV PATH "$PATH:/opt/butler" + WORKDIR /tmp # Install utilities RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install meson ninja-build gcc python3-pyyaml file git tar xz unzip zip \ @@ -53,6 +56,11 @@ RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install meson ninja-build unzip butler.zip -d /opt/butler && \ chmod +x /opt/butler && \ rm butler.zip && \ +# Download and install rcodesign + curl -L -O https://github.com/indygreg/apple-platform-rs/releases/download/apple-codesign%2F0.26.0/apple-codesign-0.26.0-x86_64-unknown-linux-musl.tar.gz && \ + mkdir -p /opt/apple-codesign && \ + tar --strip-components=1 -xvzf apple-codesign-0.26.0-x86_64-unknown-linux-musl.tar.gz -C /opt/apple-codesign && \ + rm apple-codesign-0.26.0-x86_64-unknown-linux-musl.tar.gz && \ # Verify tool versions and installation locations. echo "Verifying steamcmd install" && \ command -v steamcmd && \ @@ -60,6 +68,9 @@ RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install meson ninja-build echo "Verifying butler install" && \ command -v butler && \ butler -V && \ + echo "Verifying rcodesign install" && \ + command -v rcodesign && \ + rcodesign -V && \ echo "Verifying github-assets-uploader install" && \ command -v github-assets-uploader && \ github-assets-uploader -version