diff --git a/CHANGELOG.md b/CHANGELOG.md index 36f4cfa..28562b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ Release Versions: ## Upcoming changes (in development) +- fix(build): copy library to /usr (#71) - build: copy python packages into /usr instead of ~ros2 to avoid permission issues (#69) - feat: add is_opened flag to socket base class (#68) diff --git a/Dockerfile b/Dockerfile index cea065f..0e2939d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG ROS2_VERSION=humble -FROM ghcr.io/aica-technology/ros2-ws:humble as base +ARG ROS2_VERSION=iron +FROM ghcr.io/aica-technology/ros2-ws:${ROS2_VERSION} as base USER ${USER} FROM base as apt-dependencies @@ -128,6 +128,6 @@ RUN mv /tmp/python/local /tmp/python-usr FROM scratch as production COPY --from=apt-dependencies /tmp/apt / -COPY --from=install /tmp/communication-interfaces /usr/local +COPY --from=install /tmp/communication-interfaces /usr COPY --from=python /tmp/python-usr /usr COPY --from=python-stubs /tmp/python-usr /usr diff --git a/build.sh b/build.sh index 748efe4..833a034 100644 --- a/build.sh +++ b/build.sh @@ -3,7 +3,7 @@ IMAGE_NAME=ghcr.io/aica-technology/network-interfaces IMAGE_TAG=latest -ROS2_VERSION=humble +ROS2_VERSION=iron HELP_MESSAGE="Usage: build.sh [options] Options: