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.

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

Fix docker nightly build #2643

Merged
merged 16 commits into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
.git
.github
.vscode
build
build_*
5 changes: 1 addition & 4 deletions docker/Dockerfile.base
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:focal
FROM ubuntu:jammy

azeey marked this conversation as resolved.
Show resolved Hide resolved
RUN apt-get update \
&& apt-get install -y \
Expand All @@ -10,6 +10,3 @@ RUN scripts/enable_stable.sh

COPY docker/scripts/install_common_deps.sh scripts/install_common_deps.sh
RUN scripts/install_common_deps.sh

COPY docker/scripts/enable_gcc8.sh scripts/enable_gcc8.sh
RUN scripts/enable_gcc8.sh
6 changes: 4 additions & 2 deletions docker/Dockerfile.nightly
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ COPY docker/scripts/enable_nightly.sh scripts/enable_nightly.sh
RUN scripts/enable_nightly.sh

RUN apt-get update \
&& apt-get install -y \
&& apt-get install --no-install-recommends -y \
azeey marked this conversation as resolved.
Show resolved Hide resolved
libgz-cmake4-dev \
libgz-common6-dev \
libgz-fuel-tools10-dev \
Expand All @@ -23,7 +23,9 @@ RUN apt-get update \
libgz-gui9-dev \
libgz-msgs11-dev \
libgz-sensors9-dev \
libsdformat15-dev
libsdformat15-dev \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

COPY . gz-sim
RUN cd gz-sim \
Expand Down
10 changes: 6 additions & 4 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ use the Gazebo code found in the current source tree.

1. [Install Docker](#Install-Docker)

You need at least 10GB or free space on a hard drive.

1. *Optional:* [Install NVidia Docker](#Install-Nvidia-Docker)

Nvidia docker will be needed if you plan to run the GUI and/or sensors
Expand Down Expand Up @@ -46,7 +48,7 @@ use the Gazebo code found in the current source tree.
3. Run the docker image with a bash shell.

```
docker run -it gz-sim:nightly /bin/bash
docker run --rm -it gz-sim:nightly /bin/bash
```

4. Alternatively, you can directly run Gazebo using
Expand All @@ -73,21 +75,21 @@ distribution using debians.
image of Gazebo Garden:

```
./build.bash gz-garden ./Dockerfile.gz
./build.bash gz ./Dockerfile.gz
azeey marked this conversation as resolved.
Show resolved Hide resolved
```

2. Run the docker image using `run.bash`, and pass in the name of the docker
image (first argument to the build.bash script).

```
./run.bash gz-garden
./run.bash gz
```

3. You can pass arguments to Gazebo by appending them the
`run.bash` command. For example, to load the shapes.sdf file:

```
./run.bash gz-garden -f shapes.sdf
./run.bash gz -f shapes.sdf
```

## Appendix
Expand Down
17 changes: 0 additions & 17 deletions docker/scripts/enable_gcc8.sh

This file was deleted.

13 changes: 7 additions & 6 deletions docker/scripts/install_common_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,17 @@ sudo apt-get install --no-install-recommends -y \
cppcheck \
curl \
git \
g++-8 \
pkg-config \
g++11 \
azeey marked this conversation as resolved.
Show resolved Hide resolved
lcov \
pkg-config

sudo apt-get install --no-install-recommends -y \
clang-tidy-6.0 \
python-yaml \
libclang-6.0-dev
clang-tidy-14 \
python3-yaml

sudo apt-get install --no-install-recommends -y \
libbenchmark-dev \
libbenchmark1

sudo apt-get clean && sudo rm -rf /var/lib/apt/lists/*
sudo apt-get clean
sudo rm -rf /var/lib/apt/lists/*
Loading