Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

2.4.0 - Feat: update base and slim images like in CE #9

Merged
merged 13 commits into from
Jan 9, 2023
Merged

2.4.0 - Feat: update base and slim images like in CE #9

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a33ccc3
change bases
AlexFernandes-MOVAI Mar 29, 2022
82fcfe8
Merge branch 'main' into feat/slim_img
AlexFernandes-MOVAI May 5, 2022
6b99f1c
more fixes
AlexFernandes-MOVAI May 5, 2022
b6272eb
Merge main into feat/slim_img
github-actions[bot] May 5, 2022
9dc03f2
fix docker registry
AlexFernandes-MOVAI May 5, 2022
53ff258
Merge main into feat/slim_img
github-actions[bot] May 5, 2022
3cf380a
Update Dockerfile
AlexFernandes-MOVAI May 6, 2022
d3122e4
Merge branch 'main' into feat/slim_img
AlexFernandes-MOVAI Sep 26, 2022
087dba1
Merge branch 'dev' into feat/slim_img
AlexFernandes-MOVAI Oct 25, 2022
b86f5cd
Merge dev into feat/slim_img
github-actions[bot] Oct 28, 2022
3dd3db8
Merge dev into feat/slim_img
github-actions[bot] Jan 9, 2023
f7c541c
Merge dev into feat/slim_img
github-actions[bot] Jan 9, 2023
c259702
update base images
AlexFernandes-MOVAI Jan 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ce/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This Dockerfile is used to build an rviz image based on Ubuntu
ARG DOCKER_REGISTRY="registry.cloud.mov.ai"
FROM ${DOCKER_REGISTRY}/devops/movai-base-focal:v1.2.0
FROM ${DOCKER_REGISTRY}/devops/movai-base-focal:v1.4.5

LABEL description="MOV.AI Graphical Tools"
LABEL maintainer="devop@mov.ai"
Expand Down
4 changes: 1 addition & 3 deletions files/bin/rviz.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# File: rviz.sh
set -e

source "/opt/ros/${ROS_DISTRO}/setup.bash"

ROS_MASTER_URI="http://${ROS_MASTER}:${ROS_MASTER_PORT}" "/opt/ros/${ROS_DISTRO}/bin/rviz"
MithunKinarullathil marked this conversation as resolved.
Show resolved Hide resolved
ROS_MASTER_URI="http://${ROS_MASTER}:${ROS_MASTER_PORT}" "/usr/bin/rviz"
2 changes: 1 addition & 1 deletion files/common/install/ros-tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ set -e

echo "Install IceWM UI components"
apt-get update
apt-get install -y terminator
apt-get install -y terminator rviz
apt-get clean -y
4 changes: 3 additions & 1 deletion files/home/.bashrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ if [ "$TERM" != "linux" ] && [ -f "/usr/local/bin/powerline-go" ]; then
PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND"
fi

source "/opt/ros/$ROS_DISTRO/setup.bash"
if [ -f /opt/ros/${ROS_DISTRO}/setup.bash ]; then
source "/opt/ros/$ROS_DISTRO/setup.bash"
fi

export ROS_MASTER_URI="http://${ROS_MASTER}:${ROS_MASTER_PORT}"
12 changes: 5 additions & 7 deletions melodic/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This Dockerfile is used to build an headless vnc image based on Ubuntu

FROM osrf/ros:melodic-desktop-full
ARG DOCKER_REGISTRY="registry.cloud.mov.ai"
FROM ${DOCKER_REGISTRY}/devops/movai-base-melodic:v1.4.5

LABEL description="MOV.AI Graphical Tools"
LABEL maintainer="devop@mov.ai"
Expand Down Expand Up @@ -31,7 +31,8 @@ ENV DISPLAY=:1 \
VNC_VIEW_ONLY=false \
ROS_VERSION=${ROS_VERSION} \
ROS_MASTER=${ROS_MASTER} \
ROS_MASTER_PORT=${ROS_MASTER_PORT}
ROS_MASTER_PORT=${ROS_MASTER_PORT} \
ROS_DISTRO=melodic

### Environment config
ENV HOME=${USER_HOME} \
Expand All @@ -44,9 +45,6 @@ ENV HOME=${USER_HOME} \
### ROS Config
ENV ROS_MASTER_URI="http://${ROS_MASTER}:${ROS_MASTER_PORT}"

RUN adduser --uid ${USER_ID} --home ${HOME} --disabled-password --gecos '' ${USER_NAME} && \
apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key "${ROS_GPG_KEY}"

WORKDIR ${HOME}

### Add all install scripts for further steps
Expand Down Expand Up @@ -75,7 +73,7 @@ RUN find $INST_SCRIPTS -name '*.sh' -exec chmod a+x {} + && \
chown -R movai:movai ${HOME}

### Overwritting Rviz config
COPY files/home/default.rviz /opt/ros/${ROS_VERSION}/share/rviz/default.rviz
COPY --chown=movai:movai files/home/default.rviz /opt/ros/${ROS_VERSION}/share/rviz/default.rviz

USER movai
ENTRYPOINT ["/dockerstartup/vnc_startup.sh"]
Expand Down
12 changes: 5 additions & 7 deletions noetic/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This Dockerfile is used to build an headless vnc image based on Ubuntu

FROM osrf/ros:noetic-desktop-full
ARG DOCKER_REGISTRY="registry.cloud.mov.ai"
FROM ${DOCKER_REGISTRY}/devops/movai-base-focal:v1.4.5

LABEL description="MOV.AI Graphical Tools"
LABEL maintainer="devop@mov.ai"
Expand Down Expand Up @@ -31,7 +31,8 @@ ENV DISPLAY=:1 \
VNC_VIEW_ONLY=false \
ROS_VERSION=${ROS_VERSION} \
ROS_MASTER=${ROS_MASTER} \
ROS_MASTER_PORT=${ROS_MASTER_PORT}
ROS_MASTER_PORT=${ROS_MASTER_PORT} \
ROS_DISTRO=noetic

### Environment config
ENV HOME=${USER_HOME} \
Expand All @@ -44,9 +45,6 @@ ENV HOME=${USER_HOME} \
### ROS Config
ENV ROS_MASTER_URI="http://${ROS_MASTER}:${ROS_MASTER_PORT}"

RUN adduser --uid ${USER_ID} --home ${HOME} --disabled-password --gecos '' ${USER_NAME} && \
apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key "${ROS_GPG_KEY}"

WORKDIR ${HOME}

### Add all install scripts for further steps
Expand Down Expand Up @@ -77,7 +75,7 @@ RUN find $INST_SCRIPTS -name '*.sh' -exec chmod a+x {} + && \
ln -sf /usr/bin/python2 /usr/bin/python

### Overwritting Rviz config
COPY files/home/default.rviz /opt/ros/${ROS_VERSION}/share/rviz/default.rviz
COPY --chown=movai:movai files/home/default.rviz /opt/ros/${ROS_VERSION}/share/rviz/default.rviz

USER movai
ENTRYPOINT ["/dockerstartup/vnc_startup.sh"]
Expand Down