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

ベースイメージのアップデート #627

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
+34 −18
Open

ベースイメージのアップデート #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2c9537b
ベースイメージのアップデート
HansRobo Nov 15, 2024
f4d9e22
その他のDockerfileの更新
HansRobo Nov 15, 2024
6444673
style(pre-commit): autofix
pre-commit-ci[bot] Nov 15, 2024
76f7f16
sudo
HansRobo Nov 16, 2024
3922ba0
Update build_test.yaml
HansRobo Nov 17, 2024
36bf4b0
Update build_test.yaml
HansRobo Nov 17, 2024
57ae1be
Update build_test.yaml
HansRobo Nov 17, 2024
0012dbe
Merge branch 'develop' into update-base-image
HansRobo Dec 26, 2024
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
16 changes: 11 additions & 5 deletions .github/workflows/build_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ jobs:
|| fromJSON('[ "ubuntu-latest" ]')
}}
timeout-minutes: 30
container: ros:${{ matrix.rosdistro }}
container: ghcr.io/ibis-ssl/crane:base
defaults:
run:
working-directory: /home/developer/ibis_ws
env:
DEBIAN_FRONTEND: noninteractive
strategy:
Expand All @@ -25,16 +28,19 @@ jobs:
steps:
- name: suppress warnings
run: |
git config --global --add safe.directory '*'
sudo git config --global --add safe.directory '*'

- name: Set PR fetch depth
run: echo "PR_FETCH_DEPTH=$(( ${{ github.event.pull_request.commits }} + 1 ))" >> "${GITHUB_ENV}"
- name: suppress warnings
run: |
whoami
pwd

- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: ${{ env.PR_FETCH_DEPTH }}
token: ${{ secrets.GITHUB_TOKEN }}
persist-credentials: false
path: src/crane

- name: Setup Problem Matchers for GCC
run: echo "::add-matcher::.github/matchers/gcc.json"
Expand Down
26 changes: 18 additions & 8 deletions docker/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,34 @@
ARG ROS_DISTRO="jazzy"
FROM ros:$ROS_DISTRO
FROM ghcr.io/ibis-ssl/docker-ros2-images:$ROS_DISTRO

ENV PATH $PATH:/usr/local/go/bin

ENV ROS_OVERLAY /root/ibis_ws
ENV ROS_OVERLAY /home/developer/ibis_ws
WORKDIR $ROS_OVERLAY/src

COPY . crane

RUN apt-get update && \
apt-get install -y wget ccache python3-pip ffmpeg
RUN sudo apt-get update && \
sudo apt-get install -y wget ccache python3-pip ffmpeg&& \
wget https://launchpad.net/ubuntu/+archive/primary/+files/liborocos-bfl0.8_0.8.0-6_amd64.deb && \
wget https://launchpad.net/ubuntu/+archive/primary/+files/liborocos-bfl-dev_0.8.0-6_amd64.deb && \
sudo apt-get install -y ./liborocos-bfl0.8_0.8.0-6_amd64.deb && \

Check warning on line 15 in docker/base/Dockerfile

View workflow job for this annotation

GitHub Actions / spell-check 

Unknown word (liborocos)
sudo apt-get install -y ./liborocos-bfl-dev_0.8.0-6_amd64.deb && \

Check warning on line 16 in docker/base/Dockerfile

View workflow job for this annotation

GitHub Actions / spell-check 

Unknown word (liborocos)
sudo apt-get clean && \
sudo rm -rf /var/lib/apt/lists/*


RUN wget https://go.dev/dl/go1.22.4.linux-amd64.tar.gz && \
tar -C /usr/local -xzf go1.22.4.linux-amd64.tar.gz && \
sudo tar -C /usr/local -xzf go1.22.4.linux-amd64.tar.gz && \
rm go1.22.4.linux-amd64.tar.gz

RUN vcs import . < crane/dependency_${ROS_DISTRO}.repos

RUN rosdep update && \
rosdep install -iy --from-paths .
RUN sudo apt-get update && \
rosdep update && \
rosdep install -iy --from-paths . && \
sudo apt-get clean && \
sudo rm -rf /var/lib/apt/lists/*

# srcフォルダ内のフォルダを削除
RUN find . -mindepth 1 -type d -exec rm -rf {} +
RUN find . -mindepth 1 -type d -exec sudo rm -rf {} +
2 changes: 1 addition & 1 deletion docker/ccache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ghcr.io/ibis-ssl/crane:base

ENV ROS_OVERLAY /root/ibis_ws
ENV ROS_OVERLAY /home/developer/ibis_ws
WORKDIR $ROS_OVERLAY/src
SHELL ["/bin/bash", "-c"]

Expand Down
4 changes: 2 additions & 2 deletions docker/prebuilt/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ghcr.io/ibis-ssl/crane:base

ENV ROS_OVERLAY /root/ibis_ws
ENV ROS_OVERLAY /home/developer/ibis_ws
WORKDIR $ROS_OVERLAY/src
SHELL ["/bin/bash", "-c"]

Expand All @@ -10,7 +10,7 @@ RUN vcs import . < crane/dependency_${ROS_DISTRO}.repos

RUN rosdep update && \
rosdep install -iy --from-paths . && \
rm -rf /var/lib/apt/lists/
sudo rm -rf /var/lib/apt/lists/

RUN cd .. && \
source /opt/ros/${ROS_DISTRO}/setup.bash && \
Expand Down
4 changes: 2 additions & 2 deletions docker/scenario/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ghcr.io/ibis-ssl/crane:base

ENV ROS_OVERLAY /root/ibis_ws
ENV ROS_OVERLAY /home/developer/ibis_ws
ENV PATH $PATH:/usr/local/go/bin
WORKDIR $ROS_OVERLAY/src
SHELL ["/bin/bash", "-c"]
Expand All @@ -11,7 +11,7 @@ RUN vcs import . < crane/dependency_${ROS_DISTRO}.repos

RUN rosdep update && \
rosdep install -iy --from-paths . && \
rm -rf /var/lib/apt/lists/
sudo rm -rf /var/lib/apt/lists/

RUN cd .. && \
source /opt/ros/${ROS_DISTRO}/setup.bash && \
Expand Down
Loading