Skip to content

Commit

Permalink
Fix docker nightly build (#2643)
Browse files Browse the repository at this point in the history
Signed-off-by: Maksim Derbasov <[email protected]>
  • Loading branch information
ntfshard authored Jan 6, 2025
1 parent 9d6230a commit a8c5ec8
Show file tree
Hide file tree
Showing 9 changed files with 55 additions and 34 deletions.
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_*
33 changes: 33 additions & 0 deletions .github/workflows/docker-nightly.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: nightly docker image builds

on:
push:
schedule:
- cron: '0 6 * * *'

jobs:
main:
runs-on: ubuntu-latest
steps:
- uses: docker/setup-buildx-action@v3
with:
driver: docker
- uses: actions/checkout@v4
with:
repository: gazebosim/gz-sim
ref: gz-sim9
path: src
- name: build base image
uses: docker/build-push-action@v6
with:
file: src/docker/Dockerfile.base
context: src
tags: gz-sim:base
load: true
- name: build nightly image
uses: docker/build-push-action@v6
with:
file: src/docker/Dockerfile.nightly
build-contexts: |
gz-sim:base=docker-image://gz-sim:base
context: src
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:noble

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
4 changes: 3 additions & 1 deletion docker/Dockerfile.nightly
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 4 additions & 2 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,13 +48,13 @@ 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
```
./docker/run.bash gz-sim:nightly gz-sim-server -v 4
./docker/run.bash gz-sim:nightly gz sim -v 4
```
## Gazebo Using Debians In Docker
Expand Down
2 changes: 1 addition & 1 deletion docker/run.bash
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ARGS=("$@")
XAUTH=/tmp/.docker.xauth
if [ ! -f $XAUTH ]
then
xauth_list=$(xauth nlist :0 | sed -e 's/^..../ffff/')
xauth_list=$(xauth nlist $DISPLAY | sed -e 's/^..../ffff/')
if [ ! -z "$xauth_list" ]
then
echo $xauth_list | xauth -f $XAUTH nmerge -
Expand Down
17 changes: 0 additions & 17 deletions docker/scripts/enable_gcc8.sh

This file was deleted.

17 changes: 9 additions & 8 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++ \
lcov \
pkg-config

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

# for benchmarks in gz-sim/test/benchmark
sudo apt-get install --no-install-recommends -y \
libbenchmark-dev \
libbenchmark1
libbenchmark-dev

sudo apt-get clean && sudo rm -rf /var/lib/apt/lists/*
sudo apt-get clean
sudo rm -rf /var/lib/apt/lists/*
2 changes: 1 addition & 1 deletion test/benchmark/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
Given a set of changes to the codebase, it is often useful to see the difference in performance.
Once two (or more) benchmarks have been executed, compare the results by downloading the [benchmark tools](https://github.com/google/benchmark/tree/master/tools), and then run the following command:
Once two (or more) benchmarks have been executed, compare the results by downloading the [benchmark tools](https://github.com/google/benchmark/tree/main/tools), and then run the following command:
```
# From the downloaded "tools" folder
Expand Down

0 comments on commit a8c5ec8

Please sign in to comment.