EricXZ/devenv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enhance Docker workflows: update image namespace handling, add cache key computation, and refine vendor package installation

Browse Source
This commit is contained in:
EricX-Zhao
2026-06-24 15:36:23 +03:00
parent bbb61c3f5e
commit 0d7c134b1f
3 changed files with 128 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cross_compile/ros2/lyrical/ros_lyrical.Dockerfile
+2
View File
@@ -57,6 +57,8 @@ RUN mv _reindexer.cpython-310-x86_64-linux-gnu.so _reindexer.cpython-310-aarch64
RUN mv _writer.cpython-310-x86_64-linux-gnu.so _writer.cpython-310-aarch64-linux-gnu.so
RUN mv _message_definitions.cpython-310-x86_64-linux-gnu.so _message_definitions.cpython-310-aarch64-linux-gnu.so
RUN mv _reader.cpython-310-x86_64-linux-gnu.so _reader.cpython-310-aarch64-linux-gnu.so
WORKDIR ${TARGET_SYSROOT}/lib/python3.10/site-packages/rosidl_buffer
RUN mv _rosidl_buffer_py.cpython-310-x86_64-linux-gnu.so _rosidl_buffer_py.cpython-310-aarch64-linux-gnu.so
FROM ${CC_PLATFORM_IMAGE} AS rmw_zenoh_builder
cross_compile/vendor_packages/vendor_packages.Dockerfile
+12 -3
View File
@@ -121,12 +121,19 @@ ENV CC=aarch64-none-linux-gnu-gcc \
RANLIB=aarch64-none-linux-gnu-ranlib \
HOSTARCH=aarch64-none-linux-gnu \
BUILDARCH=x86_64-linux-gnu
# export CC=aarch64-none-linux-gnu-gcc
# export CXX=aarch64-none-linux-gnu-g++
# export AR=aarch64-none-linux-gnu-ar
# export RANLIB=aarch64-none-linux-gnu-ranlib
# export HOSTARCH=aarch64-none-linux-gnu
# export BUILDARCH=x86_64-linux-gn
RUN CFLAGS="-fPIC" LDFLAGS="-fPIC" ./configure \
--host=aarch64-none-linux-gnu \
--build=x86_64-linux-gnu \
--prefix=${TARGET_SYSROOT} \
--with-build-python=python3.12 \
--with-build-python=python3.10 \
--disable-ipv6 \
--enable-optimizations \
--with-openssl=${TARGET_SYSROOT} \
@@ -137,11 +144,13 @@ RUN CFLAGS="-fPIC" LDFLAGS="-fPIC" ./configure \
# https://github.com/benfogle/crossenv
# cross compile python packages
WORKDIR /tmp
# /opt/python3.10/venv/build/bin/pip install 'setuptools==68.2.2' wheel
RUN python3 -m pip install crossenv \
&& python3 -m crossenv ${TARGET_SYSROOT}/bin/python3 venv \
&& . venv/bin/activate \
&& pip -v install numpy==1.21.5 lark==1.1.1 packaging typing-extensions --prefix=${TARGET_SYSROOT}
&& pip -v install numpy==1.21.5 lark==1.1.1 packaging typing-extensions --prefix=${TARGET_SYSROOT} \
&& ./venv/build/bin/pip install 'setuptools==68.2.2' wheel \
&& pip -v install empy==3.3.4 pyyaml psutil argcomplete --prefix=${TARGET_SYSROOT}
FROM ${CC_PLATFORM_IMAGE} AS final