diff --git a/rust/cubestore/cross/README.md b/rust/cubestore/cross/README.md index 28332e49e4c85..e71102f299aaf 100644 --- a/rust/cubestore/cross/README.md +++ b/rust/cubestore/cross/README.md @@ -19,18 +19,13 @@ Keep in mind: ```sh # dmY -export $(cat .env | xargs) +docker buildx bake x86_64-unknown-linux-gnu-python --push +docker buildx bake aarch64-unknown-linux-gnu-python --push +docker buildx bake x86_64-unknown-linux-musl-python --push -docker buildx build --platform linux/amd64 -t cubejs/rust-cross:x86_64-unknown-linux-gnu-$CROSS_VERSION -f x86_64-unknown-linux-gnu.Dockerfile . -docker buildx build --platform linux/amd64 -t cubejs/rust-cross:x86_64-unknown-linux-musl-$CROSS_VERSION -f x86_64-unknown-linux-musl.Dockerfile . -docker buildx build --platform linux/amd64 -t cubejs/rust-cross:aarch64-unknown-linux-gnu-$CROSS_VERSION -f aarch64-unknown-linux-gnu.Dockerfile . - -docker push cubejs/rust-cross:x86_64-unknown-linux-gnu-$CROSS_VERSION -docker push cubejs/rust-cross:x86_64-unknown-linux-musl-$CROSS_VERSION -docker push cubejs/rust-cross:aarch64-unknown-linux-gnu-$CROSS_VERSION +export CROSS_VERSION=15082024 # Verify versions docker run --platform linux/amd64 --rm -it cubejs/rust-cross:x86_64-unknown-linux-gnu-$CROSS_VERSION cc --version -docker run --platform linux/amd64 --rm -it cubejs/rust-cross:x86_64-unknown-linux-gnu-buster-$CROSS_VERSION cc --version docker run --platform linux/amd64 --rm -it cubejs/rust-cross:aarch64-unknown-linux-gnu-$CROSS_VERSION cc --version ``` diff --git a/rust/cubestore/cross/aarch64-unknown-linux-gnu-python.Dockerfile b/rust/cubestore/cross/aarch64-unknown-linux-gnu-python.Dockerfile index 4d487441f0891..cecd65a2cd35a 100644 --- a/rust/cubestore/cross/aarch64-unknown-linux-gnu-python.Dockerfile +++ b/rust/cubestore/cross/aarch64-unknown-linux-gnu-python.Dockerfile @@ -3,11 +3,11 @@ FROM base ARG PYTHON_VERSION ARG PYTHON_RELEASE +# python is required for cross compiling python :D RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y python${PYTHON_VERSION_RELEASE} \ && rm -rf /var/lib/apt/lists/*; RUN wget https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz -O - | tar -xz \ - # python is required for cross compiling python :D && cd Python-${PYTHON_VERSION} \ && touch config.site-aarch64 \ && echo "ac_cv_buggy_getaddrinfo=no" >> config.site-aarch64 \ @@ -20,7 +20,7 @@ RUN wget https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VER --prefix=/usr/aarch64-linux-gnu \ --build=aarch64-unknown-linux-gnu \ --host=x86_64-linux-gnu \ - --with-build-python=/usr/bin/python${PYTHON_VERSION_RELEASE} \ + --with-build-python=/usr/bin/python${PYTHON_RELEASE} \ && make -j $(nproc) \ && make install \ && cd .. && rm -rf Python-${PYTHON_VERSION} \