Skip to content

Commit b062428

Browse files
worky?
1 parent e79014f commit b062428

9 files changed

Lines changed: 27 additions & 30 deletions

File tree

ROS2/AMD64x86/humble/Dockerfile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,12 @@ RUN echo 'Asia/Kolkata' > /etc/timezone && \
3232
# install packages
3333
COPY aptPkgs.list /tmp/aptPkgs.list
3434
RUN apt-get update && apt-get install -q -y --no-install-recommends \
35+
dirmngr \
36+
gnupg2 \
3537
curl \
38+
ca-certificates \
3639
&& rm -rf /var/lib/apt/lists/*
3740

38-
# Create non root user with sudo privilege
39-
RUN groupadd --gid $USER_GID $USERNAME \
40-
&& useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
41-
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
42-
&& chmod 0440 /etc/sudoers.d/$USERNAME
43-
4441
# Setup ROS Apt sources
4542
RUN curl -L -s -o /tmp/ros2-apt-source.deb https://github.com/ros-infrastructure/ros-apt-source/releases/download/1.1.0/ros2-apt-source_1.1.0.jammy_all.deb \
4643
&& echo "1600cb8cc28258a39bffc1736a75bcbf52d1f2db371a4d020c1b187d2a5a083b /tmp/ros2-apt-source.deb" | sha256sum --strict --check \
@@ -55,6 +52,11 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \
5552
$(cat /tmp/aptPkgs.list) \
5653
&& rm -rf /var/lib/apt/lists/*
5754

55+
# Create non root user with sudo privilege
56+
RUN groupadd --gid $USER_GID $USERNAME \
57+
&& useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
58+
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
59+
&& chmod 0440 /etc/sudoers.d/$USERNAME
5860
USER $USERNAME
5961

6062
# setup entrypoint

ROS2/AMD64x86/humble/aptPkgs.list

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
at
22
bash-completion
33
build-essential
4-
ca-certificates
54
cmake
6-
dirmngr
75
git
86
gnupg
9-
gnupg2
107
libaprutil1
118
libgl1-mesa-dev
129
libglfw3-dev

ROS2/AMD64x86/humble_cuda/Dockerfile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,12 @@ RUN echo 'Asia/Kolkata' > /etc/timezone && \
3232
# install packages
3333
COPY aptPkgs.list /tmp/aptPkgs.list
3434
RUN apt-get update && apt-get install -q -y --no-install-recommends \
35+
dirmngr \
36+
gnupg2 \
3537
curl \
38+
ca-certificates \
3639
&& rm -rf /var/lib/apt/lists/*
3740

38-
# Create non root user with sudo privilege
39-
RUN groupadd --gid $USER_GID $USERNAME \
40-
&& useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
41-
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
42-
&& chmod 0440 /etc/sudoers.d/$USERNAME
43-
4441
# Setup ROS Apt sources
4542
RUN curl -L -s -o /tmp/ros2-apt-source.deb https://github.com/ros-infrastructure/ros-apt-source/releases/download/1.1.0/ros2-apt-source_1.1.0.jammy_all.deb \
4643
&& echo "1600cb8cc28258a39bffc1736a75bcbf52d1f2db371a4d020c1b187d2a5a083b /tmp/ros2-apt-source.deb" | sha256sum --strict --check \
@@ -55,6 +52,11 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \
5552
$(cat /tmp/aptPkgs.list) \
5653
&& rm -rf /var/lib/apt/lists/*
5754

55+
# Create non root user with sudo privilege
56+
RUN groupadd --gid $USER_GID $USERNAME \
57+
&& useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
58+
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
59+
&& chmod 0440 /etc/sudoers.d/$USERNAME
5860
USER $USERNAME
5961

6062
# setup entrypoint

ROS2/AMD64x86/humble_cuda/aptPkgs.list

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
at
22
bash-completion
33
build-essential
4-
ca-certificates
54
cmake
6-
dirmngr
75
git
86
gnupg
9-
gnupg2
107
libaprutil1
118
libgl1-mesa-dev
129
libglfw3-dev

ROS2/AMD64x86/humble_gazebo/Dockerfile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,12 @@ RUN echo 'Asia/Kolkata' > /etc/timezone && \
3535
# install packages
3636
COPY aptPkgs.list /tmp/aptPkgs.list
3737
RUN apt-get update && apt-get install -q -y --no-install-recommends \
38+
dirmngr \
39+
gnupg2 \
3840
curl \
41+
ca-certificates \
3942
&& rm -rf /var/lib/apt/lists/*
4043

41-
# Create non root user with sudo privilege
42-
RUN groupadd --gid $USER_GID $USERNAME \
43-
&& useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
44-
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
45-
&& chmod 0440 /etc/sudoers.d/$USERNAME
46-
4744
# Setup ROS Apt sources
4845
RUN curl -L -s -o /tmp/ros2-apt-source.deb https://github.com/ros-infrastructure/ros-apt-source/releases/download/1.1.0/ros2-apt-source_1.1.0.jammy_all.deb \
4946
&& echo "1600cb8cc28258a39bffc1736a75bcbf52d1f2db371a4d020c1b187d2a5a083b /tmp/ros2-apt-source.deb" | sha256sum --strict --check \
@@ -58,6 +55,11 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \
5855
$(cat /tmp/aptPkgs.list) \
5956
&& rm -rf /var/lib/apt/lists/*
6057

58+
# Create non root user with sudo privilege
59+
RUN groupadd --gid $USER_GID $USERNAME \
60+
&& useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
61+
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
62+
&& chmod 0440 /etc/sudoers.d/$USERNAME
6163
USER $USERNAME
6264

6365
# setup entrypoint

ROS2/AMD64x86/humble_gazebo/aptPkgs.list

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
at
22
bash-completion
33
build-essential
4-
ca-certificates
54
cmake
6-
dirmngr
75
git
86
gnupg
9-
gnupg2
107
libaprutil1
118
libgl1-mesa-dev
129
libglfw3-dev

ROS2/AMD64x86/wheelchair2_base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/smart-wheelchair-rrc/humble:dev5.0.4
1+
FROM ghcr.io/smart-wheelchair-rrc/humble:dev5.0.5
22

33
ARG USERNAME=container_user
44

ROS2/AMD64x86/wheelchair2_base_gazebo/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/smart-wheelchair-rrc/humble_gazebo:dev5.0.4
1+
FROM ghcr.io/smart-wheelchair-rrc/humble_gazebo:dev5.0.5
22

33
ARG USERNAME=container_user
44

ROS2/AMD64x86/wheelchair2_cuda/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/smart-wheelchair-rrc/humble_cuda:dev5.0.4
1+
FROM ghcr.io/smart-wheelchair-rrc/humble_cuda:dev5.0.5
22

33
ARG USERNAME=container_user
44

0 commit comments

Comments
 (0)