Skip to content

Commit

Permalink
Upgrade git version
Browse files Browse the repository at this point in the history
  • Loading branch information
patrick-5546 committed Aug 19, 2022
1 parent ae03358 commit 03d7218
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 12 deletions.
16 changes: 8 additions & 8 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ FROM ghcr.io/ubcsailbot/vscode_ros2_workspace/dev:latest
# ** [Optional] Uncomment this section to install additional packages. **
#
# ENV DEBIAN_FRONTEND=noninteractive
# RUN apt-get update \
# && apt-get -y install --no-install-recommends <your-package-list-here> \
# #
# # Clean up
# && apt-get autoremove -y \
# && apt-get clean -y \
# && rm -rf /var/lib/apt/lists/*
# ENV DEBIAN_FRONTEND=dialog
# RUN sudo apt-get update \
# && sudo apt-get -y install --no-install-recommends \
# # Your package list here
# # Clean up
# && sudo apt-get autoremove -y \
# && sudo apt-get clean -y \
# && rm -rf /var/lib/apt/lists/*
# ENV DEBIAN_FRONTEND=

# Copy configuration files (e.g., .vimrc) from config/ to the container's home directory
COPY config ${HOME}
18 changes: 14 additions & 4 deletions .devcontainer/dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,12 @@ FROM ghcr.io/ubcsailbot/vscode_ros2_workspace/base:raye as builder
# develop configuration based on athackst's image
# https://github.com/athackst/dockerfiles/blob/main/ros2/eloquent.Dockerfile
ENV DEBIAN_FRONTEND=noninteractive
# update apt repository to install latest version of git
RUN add-apt-repository ppa:git-core/ppa -y
RUN apt-get update && apt-get install -y \
bash-completion \
build-essential \
cmake \
gdb \
git \
less \
pylint3 \
python3-argcomplete \
python3-colcon-common-extensions \
Expand Down Expand Up @@ -52,7 +49,20 @@ RUN groupadd --gid $USER_GID $USERNAME \
ENV DEBIAN_FRONTEND=
ENV AMENT_CPPCHECK_ALLOW_SLOW_VERSIONS=1

# FROM builder
FROM builder

# install latest version of git
ENV DEBIAN_FRONTEND=noninteractive
RUN sudo apt-get update \
&& sudo apt-get -y install --no-install-recommends software-properties-common \
&& sudo add-apt-repository ppa:git-core/ppa -y \
&& sudo apt-get update \
&& sudo apt-get -y install --no-install-recommends git \
# Clean up
&& sudo apt-get autoremove -y \
&& sudo apt-get clean -y \
&& rm -rf /var/lib/apt/lists/*
ENV DEBIAN_FRONTEND=

# ENV USER ros
# USER ros
Expand Down

0 comments on commit 03d7218

Please sign in to comment.