Skip to content

Commit 5ad5abd

Browse files
marcoshuckhidmic
andauthored
Fix rosdep install execution (#115)
* Fix rosdep install execution Running rosdep update and rosdep install returns a permission denied error as described in #114. This prevented the release target to be executed. Adding a `rosdep fix-permissions` instruction to be run in sudo mode fixes the issue. Signed-off-by: Marcos Huck <marcos@huck.com.ar> Signed-off-by: Marcos Huck <marcoshuck@ekumenlabs.com> * Replace base image with lambkin+embed-ubuntu-devel Signed-off-by: Marcos Huck <marcos@huck.com.ar> Signed-off-by: Marcos Huck <marcoshuck@ekumenlabs.com> * Externalize FIXUSER Signed-off-by: Marcos Huck <marcos@huck.com.ar> Signed-off-by: Marcos Huck <marcoshuck@ekumenlabs.com> * Apply suggestions from code review Signed-off-by: Marcos Huck <marcos@huck.com.ar> Signed-off-by: Marcos Huck <marcoshuck@ekumenlabs.com> * Remove root user usage in FIXUSER Signed-off-by: Marcos Huck <marcos@huck.com.ar> Signed-off-by: Marcos Huck <marcoshuck@ekumenlabs.com> * Remove workdir check in FIXUSER Signed-off-by: Marcos Huck <marcos@huck.com.ar> Signed-off-by: Marcos Huck <marcoshuck@ekumenlabs.com> * Simplify FIXUSER Signed-off-by: Marcos Huck <marcos@huck.com.ar> Signed-off-by: Marcos Huck <marcoshuck@ekumenlabs.com> * Remove arguments on FIXUSER call Signed-off-by: Marcos Huck <marcos@huck.com.ar> Signed-off-by: Marcos Huck <marcoshuck@ekumenlabs.com> * Create separate Earthfile for rosdep Signed-off-by: Marcos Huck <marcos@huck.com.ar> Signed-off-by: Marcos Huck <marcoshuck@ekumenlabs.com> * Update src/benchmarks/beluga_vs_nav2/Earthfile Co-authored-by: Michel Hidalgo <michel@ekumenlabs.com> Signed-off-by: Marcos Huck <marcos@huck.com.ar> Signed-off-by: Marcos Huck <marcoshuck@ekumenlabs.com> --------- Signed-off-by: Marcos Huck <marcos@huck.com.ar> Signed-off-by: Marcos Huck <marcoshuck@ekumenlabs.com> Co-authored-by: Michel Hidalgo <michel@ekumenlabs.com>
1 parent f7dd7e7 commit 5ad5abd

2 files changed

Lines changed: 22 additions & 1 deletion

File tree

src/benchmarks/beluga_vs_nav2/Earthfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ VERSION 0.8
1616

1717
IMPORT ../../external/os AS os
1818
IMPORT ../../.. AS lambkin
19+
IMPORT ../../external/rosdep AS rosdep
1920

2021
devel:
2122
ARG distro=jammy
@@ -34,6 +35,7 @@ devel:
3435
apt clean && rm -rf /var/lib/apt/lists/*
3536
RUN pip install linuxdoc sphinxcontrib.datatemplates sphinxcontrib-repl
3637
DO os+ADDUSER --user=${user} --uid=${uid} --gid=${gid} --workdir=/workspace
38+
DO rosdep+FIXUSER
3739
SAVE IMAGE ekumenlabs/beluga-vs-nav2:dev
3840

3941
local-devel:
@@ -48,7 +50,7 @@ local-devel:
4850
build:
4951
ARG distro=jammy
5052
ARG rosdistro # forward
51-
FROM lambkin+ubuntu-devel --distro=${distro} --rosdistro=${rosdistro} --components="external/ros2"
53+
FROM lambkin+embed-ubuntu-devel --distro=${distro} --rosdistro=${rosdistro} --components="external/ros2"
5254
RUN mkdir -p /workspace/src
5355
WORKDIR /workspace
5456
RUN cd src && git clone https://github.com/Ekumen-OS/beluga

src/external/rosdep/Earthfile

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Copyright 2024 Ekumen, Inc.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
VERSION 0.8
16+
17+
FIXUSER:
18+
FUNCTION
19+
RUN rosdep fix-permissions

0 commit comments

Comments
 (0)