diff --git a/README.md b/README.md index 08cadb4..28db33b 100644 --- a/README.md +++ b/README.md @@ -51,8 +51,6 @@ Currently supported docker platforms are: - `ARTICHOKE_NIGHTLY_VER` - Argument used for cache invalidation (see `Dockerfile`), defaults to SHA of latest trunk commit in upstream Artichoke repository. -- `BINDGEN_PACKAGE` - Rust bindgen package (for cargo install). -- `BINDGEN_VERSION` - Rust bindgen version. [artichoke-repo]: https://github.com/artichoke/artichoke [docker-hub]: https://hub.docker.com/r/artichokeruby/artichoke diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 75419c7..b8897da 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -63,14 +63,6 @@ ENV CARGO_NET_GIT_FETCH_WITH_CLI=true # https://doc.rust-lang.org/cargo/reference/config.html#registriescrates-ioprotocol ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse -# Install bindgen -ARG BINDGEN_PACKAGE=bindgen-cli -ARG BINDGEN_VERSION=0.65.1 -RUN set -eux; \ - rustup component add rustfmt; \ - cargo install --version $BINDGEN_VERSION --locked $BINDGEN_PACKAGE; \ - bindgen --version - ARG TARGETPLATFORM ARG TARGETARCH ARG TARGETVARIANT diff --git a/debian/bullseye/slim/Dockerfile b/debian/bullseye/slim/Dockerfile index 6bcf366..7ad9810 100644 --- a/debian/bullseye/slim/Dockerfile +++ b/debian/bullseye/slim/Dockerfile @@ -64,14 +64,6 @@ ENV CARGO_NET_GIT_FETCH_WITH_CLI=true # https://doc.rust-lang.org/cargo/reference/config.html#registriescrates-ioprotocol ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse -# Install bindgen -ARG BINDGEN_PACKAGE=bindgen-cli -ARG BINDGEN_VERSION=0.65.1 -RUN set -eux; \ - rustup component add rustfmt; \ - cargo install --version $BINDGEN_VERSION --locked $BINDGEN_PACKAGE; \ - bindgen --version - ARG TARGETPLATFORM ARG TARGETARCH ARG TARGETVARIANT @@ -85,11 +77,6 @@ ARG TARGETVARIANT ARG ARTICHOKE_NIGHTLY_VER=latest # Install artichoke RUN set -eux; \ - case "${TARGETARCH}" in \ - amd64) artichokeArch='x86_64-unknown-linux-gnu' ;; \ - arm64) artichokeArch='aarch64-unknown-linux-gnu'; export BINDGEN_EXTRA_CLANG_ARGS='--sysroot=/usr/aarch64-linux-gnu' ;; \ - *) echo >&2 "unsupported architecture: ${TARGETARCH}"; exit 1 ;; \ - esac; \ if [ "$ARTICHOKE_NIGHTLY_VER" = "latest" ]; then \ cargo install \ --target "$artichokeArch" \ diff --git a/ubuntu/jammy/Dockerfile b/ubuntu/jammy/Dockerfile index 3f1a972..bcef713 100644 --- a/ubuntu/jammy/Dockerfile +++ b/ubuntu/jammy/Dockerfile @@ -66,14 +66,6 @@ ENV CARGO_NET_GIT_FETCH_WITH_CLI=true # https://doc.rust-lang.org/cargo/reference/config.html#registriescrates-ioprotocol ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse -# Install bindgen -ARG BINDGEN_PACKAGE=bindgen-cli -ARG BINDGEN_VERSION=0.65.1 -RUN set -eux; \ - rustup component add rustfmt; \ - cargo install --version $BINDGEN_VERSION --locked $BINDGEN_PACKAGE; \ - bindgen --version - ARG TARGETPLATFORM ARG TARGETARCH ARG TARGETVARIANT @@ -87,11 +79,6 @@ ARG TARGETVARIANT ARG ARTICHOKE_NIGHTLY_VER=latest # Install artichoke RUN set -eux; \ - case "${TARGETARCH}" in \ - amd64) artichokeArch='x86_64-unknown-linux-gnu' ;; \ - arm64) artichokeArch='aarch64-unknown-linux-gnu'; export BINDGEN_EXTRA_CLANG_ARGS='--sysroot=/usr/aarch64-linux-gnu' ;; \ - *) echo >&2 "unsupported architecture: ${TARGETARCH}"; exit 1 ;; \ - esac; \ if [ "$ARTICHOKE_NIGHTLY_VER" = "latest" ]; then \ cargo install \ --target "$artichokeArch" \