Updated dockerfile

DLR-TS · Nov 8, 2023 · 44b6101 · 44b6101
1 parent 028c07f
commit 44b6101
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/docker/Dockerfile.adore_cli b/docker/Dockerfile.adore_cli
@@ -3,34 +3,31 @@ ARG USER
 ARG UID
 ARG GID
 
-FROM ros:iron-ros-core-jammy AS adore_cli
+#FROM ros:iron-ros-core-jammy AS adore_cli
+
+FROM ros:iron-ros-core-base AS adore_cli
 
 ARG USER
 ARG UID
 ARG GID
 
+#RUN apt-get update && cat /etc/os-release && apt-cache search setuptools && exit 1
 
 RUN apt-get update && \
     apt-get install --no-install-recommends -y \
-                                               xterm \
-                                               netcat \
-                                               net-tools \
-                                               apt-file \
-                                               python-is-python3 \
-                                               && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN apt-get update && \
-    apt-get install --no-install-recommends -y python3-rospy && \
-                                               python3-colcon-common-extensions \
+                                                sudo \
+                                                apt-file \
+                                                python3-rospy \
+                                                python3-colcon-common-extensions \
                                                 cmake \
                                                 ros-dev-tools \
                                                 vim \
                                                 ros-iron-ros-base \
                                                 python3-pip \
-                                                setuptools==58.2.0
-
+                                               && \
+    rm -rf /var/lib/apt/lists/*
 
+RUN python3 -m pip install setuptools==58.2.0 
 
 RUN useradd --create-home ${USER}
 
@@ -56,7 +53,7 @@ USER root
 COPY docker/files/.zshrc /home/${USER}
 RUN chown -R ${UID}:${GID} /home/${USER}
 
-RUN echo "${USER} ALL = NOPASSWD : /usr/bin/apt-get, /usr/bin/apt, /usr/bin/apt-file, /usr/bin/apt-cache, /usr/bin/aptitude" >> /etc/sudoers
+RUN echo "${USER} ALL = NOPASSWD : /usr/bin/apt-get, /usr/bin/apt, /usr/bin/python3, /usr/bin/apt-file, /usr/bin/apt-cache, /usr/bin/aptitude" >> /etc/sudoers
 
 
 RUN mkdir -p /tmp/adore

diff --git a/tools/adore_cli.sh b/tools/adore_cli.sh
@@ -39,6 +39,8 @@ printf "\n"
 #echo " ADORE_CLI_WORKING_DIRECTORY: ${ADORE_CLI_WORKING_DIRECTORY}"
 #echo " CATKIN_WORKSPACE_DIRECTORY: ${CATKIN_WORKSPACE_DIRECTORY}"
 
+source /opt/ros/iron/setup.zsh
+
 cd "${ADORE_CLI_WORKING_DIRECTORY}"
 
 if [ -z ${VEHICLE_NAME+x} ]; then