Skip to content

Commit

Permalink
Merge pull request #117 from osrf/gazebo9
Browse files Browse the repository at this point in the history
Adding Gazebo9 for xenial
  • Loading branch information
ruffsl authored Feb 1, 2018
2 parents 590a0ee + 5c09518 commit bef6c5f
Show file tree
Hide file tree
Showing 11 changed files with 250 additions and 10 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ env:
- HUB_REPO=ros HUB_RELEASE=kinetic HUB_OS_NAME=debian HUB_OS_CODE_NAME=jessie
- HUB_REPO=ros HUB_RELEASE=indigo HUB_OS_NAME=ubuntu HUB_OS_CODE_NAME=trusty
# gazebo
- HUB_REPO=gazebo HUB_RELEASE=9 HUB_OS_NAME=ubuntu HUB_OS_CODE_NAME=xenial
- HUB_REPO=gazebo HUB_RELEASE=8 HUB_OS_NAME=ubuntu HUB_OS_CODE_NAME=xenial
- HUB_REPO=gazebo HUB_RELEASE=7 HUB_OS_NAME=ubuntu HUB_OS_CODE_NAME=xenial
- HUB_REPO=gazebo HUB_RELEASE=6 HUB_OS_NAME=ubuntu HUB_OS_CODE_NAME=trusty
Expand Down
28 changes: 28 additions & 0 deletions gazebo/9/ubuntu/xenial/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
all: help

help:
@echo ""
@echo "-- Help Menu"
@echo ""
@echo " 1. make build - build all images"
@echo " 2. make pull - pull all images"
@echo " 3. make clean - remove all images"
@echo ""

build:
@docker build --tag=gazebo:gzserver9 gzserver9/.
@docker build --tag=gazebo:libgazebo9 libgazebo9/.
# @docker build --tag=gazebo:gzclient9 gzclient9/.
# @docker build --tag=gazebo:gzweb9 gzweb9/.

pull:
@docker pull gazebo:libgazebo9
@docker pull gazebo:gzserver9
# @docker pull gazebo:gzclient9
# @docker pull gazebo:gzweb9

clean:
@docker rmi -f gazebo:libgazebo9
@docker rmi -f gazebo:gzserver9
# @docker rmi -f gazebo:gzclient9
# @docker rmi -f gazebo:gzweb9
16 changes: 16 additions & 0 deletions gazebo/9/ubuntu/xenial/gzclient9/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# This is an auto generated Dockerfile for gazebo:gzclient9
# generated from docker_images/create_gzclient_image.Dockerfile.em
FROM gazebo:gzserver9

# install packages
RUN apt-get update && apt-get install -q -y \
binutils \
mesa-utils \
module-init-tools \
x-window-system\
&& rm -rf /var/lib/apt/lists/*

# install gazebo packages
RUN apt-get update && apt-get install -q -y \
gazebo9=9.0.0-1* \
&& rm -rf /var/lib/apt/lists/*
25 changes: 25 additions & 0 deletions gazebo/9/ubuntu/xenial/gzserver9/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# This is an auto generated Dockerfile for gazebo:gzserver9
# generated from docker_images/create_gzserver_image.Dockerfile.em
FROM ubuntu:xenial

# setup keys
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys D2486D2DD83DB69272AFE98867170598AF249743

# setup sources.list
RUN . /etc/os-release \
&& . /etc/lsb-release \
&& echo "deb http://packages.osrfoundation.org/gazebo/$ID-stable $DISTRIB_CODENAME main" > /etc/apt/sources.list.d/gazebo-latest.list

# install gazebo packages
RUN apt-get update && apt-get install -q -y \
gazebo9=9.0.0-1* \
&& rm -rf /var/lib/apt/lists/*

# setup environment
EXPOSE 11345

# setup entrypoint
COPY ./gzserver_entrypoint.sh /

ENTRYPOINT ["/gzserver_entrypoint.sh"]
CMD ["gzserver"]
6 changes: 6 additions & 0 deletions gazebo/9/ubuntu/xenial/gzserver9/gzserver_entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash
set -e

# setup gazebo environment
source "/usr/share/gazebo/setup.sh"
exec "$@"
42 changes: 42 additions & 0 deletions gazebo/9/ubuntu/xenial/gzweb9/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# This is an auto generated Dockerfile for gazebo:gzweb9
# generated from docker_images/create_gzweb_image.Dockerfile.em
FROM gazebo:libgazebo9

# install packages
RUN apt-get update && apt-get install -q -y \
build-essential \
cmake \
imagemagick \
libboost-all-dev \
libgts-dev \
libjansson-dev \
libtinyxml-dev \
mercurial \
nodejs \
nodejs-legacy \
npm \
pkg-config \
psmisc \
xvfb\
&& rm -rf /var/lib/apt/lists/*

# install gazebo packages
RUN apt-get update && apt-get install -q -y \
libgazebo9-dev=9.0.0-1* \
&& rm -rf /var/lib/apt/lists/*

# clone gzweb
ENV GZWEB_WS /root/gzweb
RUN hg clone https://bitbucket.org/osrf/gzweb $GZWEB_WS
WORKDIR $GZWEB_WS

# build gzweb
RUN hg up default \
&& xvfb-run -s "-screen 0 1280x1024x24" ./deploy.sh -m -t

# setup environment
EXPOSE 8080
EXPOSE 7681

# run gzserver and gzweb
CMD gzserver --verbose & npm start
57 changes: 57 additions & 0 deletions gazebo/9/ubuntu/xenial/images.yaml.em
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
%YAML 1.1
# Gazebo Dockerfile database
---
images:
gzserver@(gazebo_version):
base_image: @(os_name):@(os_code_name)
maintainer_name: @(maintainer_name)
template_name: docker_images/create_gzserver_image.Dockerfile.em
entrypoint_name: docker_images/gzserver_entrypoint.sh
template_packages:
- docker_templates
gazebo_packages:
- gazebo@(gazebo_version)
libgazebo@(gazebo_version):
base_image: @(user_name):gzserver@(gazebo_version)
maintainer_name: @(maintainer_name)
template_name: docker_images/create_gzclient_image.Dockerfile.em
template_packages:
- docker_templates
gazebo_packages:
- libgazebo@(gazebo_version)-dev
gzweb@(gazebo_version):
base_image: @(user_name):libgazebo@(gazebo_version)
maintainer_name: @(maintainer_name)
template_name: docker_images/create_gzweb_image.Dockerfile.em
template_packages:
- docker_templates
packages:
- build-essential
- cmake
- imagemagick
- libboost-all-dev
- libgts-dev
- libjansson-dev
- libtinyxml-dev
- mercurial
- nodejs
- nodejs-legacy
- npm
- pkg-config
- psmisc
- xvfb
gazebo_packages:
- libgazebo@(gazebo_version)-dev
gzclient@(gazebo_version):
base_image: @(user_name):gzserver@(gazebo_version)
maintainer_name: @(maintainer_name)
template_name: docker_images/create_gzclient_image.Dockerfile.em
template_packages:
- docker_templates
packages:
- binutils
- mesa-utils
- module-init-tools
- x-window-system
gazebo_packages:
- gazebo@(gazebo_version)
7 changes: 7 additions & 0 deletions gazebo/9/ubuntu/xenial/libgazebo9/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This is an auto generated Dockerfile for gazebo:libgazebo9
# generated from docker_images/create_gzclient_image.Dockerfile.em
FROM gazebo:gzserver9
# install gazebo packages
RUN apt-get update && apt-get install -q -y \
libgazebo9-dev=9.0.0-1* \
&& rm -rf /var/lib/apt/lists/*
13 changes: 13 additions & 0 deletions gazebo/9/ubuntu/xenial/platform.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
%YAML 1.1
# Gazebo Dockerfile database
---
platform:
os_name: ubuntu
os_code_name: xenial
gazebo_version: 9
user_name: gazebo
maintainer_name:
arch: amd64
type: distribution
version:
release: stable
37 changes: 27 additions & 10 deletions gazebo/gazebo
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ GitRepo: https://github.com/osrf/docker_images.git
########################################
# Distro: ubuntu:trusty

Tags: gzserver4
Tags: gzserver4, gzserver4-trusty
Architectures: amd64
GitCommit: 4459e46b70e082d0662237e1c62ea26cdcd8ee2c
Directory: gazebo/4/ubuntu/trusty/gzserver4

Tags: libgazebo4
Tags: libgazebo4, libgazebo4-trusty
Architectures: amd64
GitCommit: 4459e46b70e082d0662237e1c62ea26cdcd8ee2c
Directory: gazebo/4/ubuntu/trusty/libgazebo4
Expand All @@ -24,12 +24,12 @@ Directory: gazebo/4/ubuntu/trusty/libgazebo4
########################################
# Distro: ubuntu:trusty

Tags: gzserver5
Tags: gzserver5, gzserver5-trusty
Architectures: amd64
GitCommit: abba58d1fce0d00aa2a667917b3367142719e61c
Directory: gazebo/5/ubuntu/trusty/gzserver5

Tags: libgazebo5
Tags: libgazebo5, libgazebo5-trusty
Architectures: amd64
GitCommit: abba58d1fce0d00aa2a667917b3367142719e61c
Directory: gazebo/5/ubuntu/trusty/libgazebo5
Expand All @@ -41,12 +41,12 @@ Directory: gazebo/5/ubuntu/trusty/libgazebo5
########################################
# Distro: ubuntu:trusty

Tags: gzserver6
Tags: gzserver6, gzserver6-trusty
Architectures: amd64
GitCommit: 039483e1c90f52df528381de9d495679c412e84f
Directory: gazebo/6/ubuntu/trusty/gzserver6

Tags: libgazebo6
Tags: libgazebo6, libgazebo6-trusty
Architectures: amd64
GitCommit: 039483e1c90f52df528381de9d495679c412e84f
Directory: gazebo/6/ubuntu/trusty/libgazebo6
Expand All @@ -58,12 +58,12 @@ Directory: gazebo/6/ubuntu/trusty/libgazebo6
########################################
# Distro: ubuntu:xenial

Tags: gzserver7
Tags: gzserver7, gzserver7-xenial
Architectures: amd64
GitCommit: b593ba3dafc4ab63b424bd2dc39d0f4e6710ea6e
Directory: gazebo/7/ubuntu/xenial/gzserver7

Tags: libgazebo7
Tags: libgazebo7, libgazebo7-xenial
Architectures: amd64
GitCommit: b593ba3dafc4ab63b424bd2dc39d0f4e6710ea6e
Directory: gazebo/7/ubuntu/xenial/libgazebo7
Expand All @@ -75,13 +75,30 @@ Directory: gazebo/7/ubuntu/xenial/libgazebo7
########################################
# Distro: ubuntu:xenial

Tags: gzserver8
Tags: gzserver8, gzserver8-xenial
Architectures: amd64
GitCommit: 413df81c5f25236563fda9505c89a84f18448132
Directory: gazebo/8/ubuntu/xenial/gzserver8

Tags: libgazebo8, latest
Tags: libgazebo8, libgazebo8-xenial
Architectures: amd64
GitCommit: 413df81c5f25236563fda9505c89a84f18448132
Directory: gazebo/8/ubuntu/xenial/libgazebo8


################################################################################
# Release: 9

########################################
# Distro: ubuntu:xenial

Tags: gzserver9, gzserver9-xenial
Architectures: amd64
GitCommit: b8deb76898b59e0d43518f2cbdca6c90afc1debe
Directory: gazebo/9/ubuntu/xenial/gzserver8

Tags: libgazebo9, libgazebo9-xenial, latest
Architectures: amd64
GitCommit: b8deb76898b59e0d43518f2cbdca6c90afc1debe
Directory: gazebo/9/ubuntu/xenial/libgazebo8

28 changes: 28 additions & 0 deletions gazebo/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ release_names:
gzserver4:
aliases:
- "gzserver4"
- "gzserver4-$os_code_name"
libgazebo4:
aliases:
- "libgazebo4"
- "libgazebo4-$os_code_name"
'5':
eol: 2017-01-25
os_names:
Expand All @@ -43,9 +45,11 @@ release_names:
gzserver5:
aliases:
- "gzserver5"
- "gzserver5-$os_code_name"
libgazebo5:
aliases:
- "libgazebo5"
- "libgazebo5-$os_code_name"
'6':
eol: 2017-01-25
os_names:
Expand All @@ -59,9 +63,11 @@ release_names:
gzserver6:
aliases:
- "gzserver6"
- "gzserver6-$os_code_name"
libgazebo6:
aliases:
- "libgazebo6"
- "libgazebo6-$os_code_name"
'7':
eol: 2021-01-25
os_names:
Expand All @@ -75,9 +81,11 @@ release_names:
gzserver7:
aliases:
- "gzserver7"
- "gzserver7-$os_code_name"
libgazebo7:
aliases:
- "libgazebo7"
- "libgazebo7-$os_code_name"
'8':
eol: 2019-01-25
os_names:
Expand All @@ -91,9 +99,29 @@ release_names:
gzserver8:
aliases:
- "gzserver8"
- "gzserver8-$os_code_name"
libgazebo8:
aliases:
- "libgazebo8"
- "libgazebo8-$os_code_name"
'9':
eol: 2023-01-25
os_names:
ubuntu:
os_code_names:
xenial:
<<: *DEFAULT
archs:
- amd64
tag_names:
gzserver8:
aliases:
- "gzserver9"
- "gzserver9-$os_code_name"
libgazebo8:
aliases:
- "libgazebo9"
- "libgazebo9-$os_code_name"
- latest

meta:
Expand Down

0 comments on commit bef6c5f

Please sign in to comment.