Skip to content
Snippets Groups Projects
Commit 5b8a34e0 authored by Montaño Sarria, Andres Felipe's avatar Montaño Sarria, Andres Felipe
Browse files

Merge branch 'main' of git.code.tecnalia.com:andres.montano/development_environment

parents 35fb8c9f 61c3d491
Branches main
No related tags found
No related merge requests found
{
"folders": [
{
"path": "."
}
],
}
\ No newline at end of file
......@@ -2,13 +2,13 @@
# * DEVENV Base Image for ROS *
# ***********************************************************
ARG ROS_DISTRO
FROM osrf/ros:${ROS_DISTRO}-desktop-full as devenv
ENV ROS_DISTRO "${ROS_DISTRO}"
ARG ROS_DISTRO=humble
FROM osrf/ros:${ROS_DISTRO}-desktop-full AS devenv
ENV ROS_DISTRO="${ROS_DISTRO}"
ARG EXT_SHELL=bash
ENV EXT_SHELL "${EXT_SHELL}"
ENV SHELL "/bin/${EXT_SHELL}"
ENV EXT_SHELL="${EXT_SHELL}"
ENV SHELL="/bin/${EXT_SHELL}"
RUN echo "Building devenv for ROS" $ROS_DISTRO "with shell" $EXT_SHELL
# Avoid warnings by switching to noninteractive
......@@ -25,9 +25,9 @@ RUN apt-get update && apt-get install -y apt-utils
RUN apt-get install -y \
locales \
&& sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen en_US.UTF-8
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV LANG=en_US.UTF-8
ENV LANGUAGE=en_US:en
ENV LC_ALL=en_US.UTF-8
# Configure apt and install base packages
RUN apt-get update && \
......@@ -121,7 +121,7 @@ COPY ./ros_entrypoint.sh /
RUN chmod a+x /ros_entrypoint.sh
# Set running in docker for zsh powerlevel10k
ENV RUNNING_IN_DOCKER true
ENV RUNNING_IN_DOCKER=true
# Define entrypoint and command
ENTRYPOINT ["/ros_entrypoint.sh"]
......@@ -135,7 +135,7 @@ ENV DEBIAN_FRONTEND=
# ***********************************************************
# Use devenv as base image
FROM devenv as workspace-extended
FROM devenv AS workspace-extended
# Avoid warnings by switching to noninteractive
ENV DEBIAN_FRONTEND=noninteractive
......@@ -206,7 +206,7 @@ RUN if [ "$CONAN" = "install" ]; \
RUN rm -rf *
# Update this date to re-run the image final update
LABEL image.date=06-11-2024
LABEL image.date=19-12-2024
# Update final image
RUN apt-get update \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment