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

Jump to bottom

[WIP] add Ignition #84

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

[WIP] add Ignition #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d7b8ca3
add ignition packages pattern
mikaelarguedas Feb 20, 2020
7a83f69
commit copy of gzserver template and make it ignition
mikaelarguedas Feb 20, 2020
a14574d
fixup command
mikaelarguedas Feb 20, 2020
bce430b
[ignition] add docker library template
mikaelarguedas Feb 20, 2020
8534eee
remove default port exposition to not force it on consumers
mikaelarguedas Feb 21, 2020
f456963
enter bash terminal by default
mikaelarguedas Feb 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions docker_templates/packages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,14 @@

packagePatternTemplateLookup = {
'gazebo_packages': string.Template(r'(\bPackage: gazebo$gazebo_version\n)(.*?(?:\r*\n{2}))'),
'ignition_packages': string.Template(r'(\bPackage: $package\n)(.*?(?:\r*\n{2}))'),
'ros_packages': string.Template(r'(\bPackage: ros-$rosdistro_name-$package\n)(.*?(?:\r*\n{2}))'),
'ros2_packages': string.Template(r'(\bPackage: ros-$ros2distro_name-$package\n)(.*?(?:\r*\n{2}))'),
}

indexUrlTemplateLookup = {
'gazebo_packages': string.Template('http://packages.osrfoundation.org/gazebo/$os_name-$release/dists/$os_code_name/main/binary-$arch/Packages'),
'ignition_packages': string.Template('http://packages.osrfoundation.org/gazebo/$os_name-$release/dists/$os_code_name/main/binary-$arch/Packages'),
'ros_packages': string.Template('http://packages.ros.org/ros/ubuntu/dists/$os_code_name/main/binary-$arch/Packages'),
'ros2_packages': string.Template('http://packages.ros.org/ros2/ubuntu/dists/$os_code_name/main/binary-$arch/Packages'),
'ros_packages_snapshots': string.Template('http://snapshots.ros.org/$rosdistro_name/final/ubuntu/dists/$os_code_name/main/binary-$arch/Packages'),
Expand All @@ -38,12 +40,14 @@

packageNameVersionTemplateLookup = {
'gazebo_packages': string.Template('$package=$package_version*'),
'ignition_packages': string.Template('$package=$package_version*'),
'ros_packages': string.Template('ros-$rosdistro_name-$package=$package_version*'),
'ros2_packages': string.Template('ros-$ros2distro_name-$package=$package_version*'),
}

packageNameTemplateLookup = {
'gazebo_packages': string.Template('$package'),
'ignition_packages': string.Template('$package'),
'ros_packages': string.Template('ros-$rosdistro_name-$package'),
'ros2_packages': string.Template('ros-$ros2distro_name-$package'),
}
Expand Down
62 changes: 62 additions & 0 deletions docker_templates/templates/docker_images/create_ignition_image.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
@(TEMPLATE(
'snippet/add_generated_comment.Dockerfile.em',
user_name=user_name,
tag_name=tag_name,
source_template_name=template_name,
))@
@(TEMPLATE(
'snippet/from_base_image.Dockerfile.em',
template_packages=template_packages,
os_name=os_name,
os_code_name=os_code_name,
arch=arch,
base_image=base_image,
maintainer_name=maintainer_name,
))@
@(TEMPLATE(
'snippet/setup_tzdata.Dockerfile.em',
os_name=os_name,
os_code_name=os_code_name,
))@
@{
template_dependencies = [
'dirmngr',
'gnupg2',
'lsb-release',
]
}@
@(TEMPLATE(
'snippet/install_upstream_package_list.Dockerfile.em',
packages=template_dependencies,
upstream_packages=upstream_packages if 'upstream_packages' in locals() else [],
))@
@
# setup keys
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys D2486D2DD83DB69272AFE98867170598AF249743

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

# install ignition packages
RUN apt-get update && apt-get install -q -y \
@(' \\\n '.join(ignition_packages))@ \
&& rm -rf /var/lib/apt/lists/*

@[if 'entrypoint_name' in locals()]@
@[ if entrypoint_name]@
@{
entrypoint_file = entrypoint_name.split('/')[-1]
}@
# setup entrypoint
COPY ./@entrypoint_file /

ENTRYPOINT ["/@entrypoint_file"]
@[ end if]@
@[end if]@
@{
cmds = [
'bash',
]
}@
CMD ["@('", "'.join(cmds))"]
24 changes: 24 additions & 0 deletions docker_templates/templates/docker_library/ignition.em
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Maintainers: @(',\n '.join(maintainers))
GitRepo: @(repo_url)
@[for release_name, release_data in release_names.items()]@

################################################################################
# Release: @(release_name)

@[ for os_name, os_data in release_data['os_names'].items()]@
@[ for os_code_name, os_code_data in os_data['os_code_names'].items()]@
@[ if os_code_data['tag_names'] is not None]@
########################################
# Distro: @(os_name):@(os_code_name)

@[ for tag_name, tag_data in os_code_data['tag_names'].items()]@
Tags: @(', '.join(tag_data['Tags']))
Architectures: @(', '.join(tag_data['Architectures']))
GitCommit: @(tag_data['GitCommit'])
Directory: @(tag_data['Directory'])

@[ end for]@
@[ end if]@
@[ end for]@
@[ end for]@
@[end for]@