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

Update base container images for release-related jobs. #886

Merged
merged 3 commits into from
Sep 16, 2021
Merged

Update base container images for release-related jobs. #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5cfda6
Update base container images for release-related jobs.
nuclearsandwich May 19, 2021
7d5af5e
Use task_os_code_name to avoid shadowing os_code_name target parameter.
nuclearsandwich Sep 15, 2021
b9b525c
Use os_code_name template variable in base image tag.
nuclearsandwich Sep 15, 2021
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
7 changes: 4 additions & 3 deletions ros_buildfarm/templates/misc/rosdistro_cache_task.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# generated from @template_name

FROM ubuntu:xenial
@{os_code_name = 'focal'}@
FROM ubuntu:@os_code_name

VOLUME ["/var/cache/apt/archives"]

Expand All @@ -18,7 +19,7 @@ RUN useradd -u @uid -l -m buildfarm
distribution_repository_keys=distribution_repository_keys,
distribution_repository_urls=distribution_repository_urls,
os_name='ubuntu',
os_code_name='xenial',
os_code_name=os_code_name,
add_source=False,
))@

Expand All @@ -33,7 +34,7 @@ RUN echo "@today_str"
@(TEMPLATE(
'snippet/install_python3.Dockerfile.em',
os_name='ubuntu',
os_code_name='xenial',
os_code_name=os_code_name,
))@

RUN python3 -u /tmp/wrapper_scripts/apt.py update-install-clean -q -y git python3-catkin-pkg-modules python3-rosdistro python3-yaml
Expand Down
7 changes: 4 additions & 3 deletions ros_buildfarm/templates/release/release_check_sync_criteria_task.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# generated from @template_name

FROM ubuntu:xenial
@{task_os_code_name = 'focal'}@
FROM ubuntu:@task_os_code_name

VOLUME ["/var/cache/apt/archives"]

Expand All @@ -18,7 +19,7 @@ RUN useradd -u @uid -l -m buildfarm
distribution_repository_keys=distribution_repository_keys,
distribution_repository_urls=distribution_repository_urls,
os_name='ubuntu',
os_code_name='xenial',
os_code_name=task_os_code_name,
add_source=False,
))@

Expand All @@ -33,7 +34,7 @@ RUN echo "@today_str"
@(TEMPLATE(
'snippet/install_python3.Dockerfile.em',
os_name='ubuntu',
os_code_name='xenial',
os_code_name=task_os_code_name,
))@

RUN python3 -u /tmp/wrapper_scripts/apt.py update-install-clean -q -y python3-rosdistro-modules python3-yaml
Expand Down
7 changes: 4 additions & 3 deletions ros_buildfarm/templates/release/release_create_reconfigure_task.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# generated from @template_name

FROM ubuntu:xenial
@{os_code_name = 'focal'}@
FROM ubuntu:@os_code_name

VOLUME ["/var/cache/apt/archives"]

Expand All @@ -18,7 +19,7 @@ RUN useradd -u @uid -l -m buildfarm
distribution_repository_keys=distribution_repository_keys,
distribution_repository_urls=distribution_repository_urls,
os_name='ubuntu',
os_code_name='xenial',
os_code_name=os_code_name,
add_source=False,
))@

Expand All @@ -33,7 +34,7 @@ RUN echo "@today_str"
@(TEMPLATE(
'snippet/install_python3.Dockerfile.em',
os_name='ubuntu',
os_code_name='xenial',
os_code_name=os_code_name,
))@

RUN python3 -u /tmp/wrapper_scripts/apt.py update-install-clean -q -y git python3-catkin-pkg-modules python3-empy python3-pip python3-rosdistro-modules python3-yaml
Expand Down
7 changes: 4 additions & 3 deletions ros_buildfarm/templates/release/release_create_trigger_task.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# generated from @template_name

FROM ubuntu:xenial
@{os_code_name = 'focal'}@
FROM ubuntu:@os_code_name

VOLUME ["/var/cache/apt/archives"]

Expand All @@ -18,7 +19,7 @@ RUN useradd -u @uid -l -m buildfarm
distribution_repository_keys=distribution_repository_keys,
distribution_repository_urls=distribution_repository_urls,
os_name='ubuntu',
os_code_name='xenial',
os_code_name=os_code_name,
add_source=False,
))@

Expand All @@ -33,7 +34,7 @@ RUN echo "@today_str"
@(TEMPLATE(
'snippet/install_python3.Dockerfile.em',
os_name='ubuntu',
os_code_name='xenial',
os_code_name=os_code_name,
))@

RUN python3 -u /tmp/wrapper_scripts/apt.py update-install-clean -q -y python3-empy python3-pip python3-rosdistro-modules python3-yaml
Expand Down