Skip to content

Commit

Permalink
Merge branch 'master' into cottsay/split-release-script
Browse files Browse the repository at this point in the history
  • Loading branch information
@cottsay
cottsay committed Oct 14, 2024
2 parents 1945406 + 15a8d9f commit a64bf04
Show file tree
Hide file tree
Showing 25 changed files with 98 additions and 24 deletions.
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/ci/ci_create_reconfigure_task.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ ENV DEBIAN_FRONTEND noninteractive
timezone=timezone,
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/add_distribution_repositories.Dockerfile.em',
Expand Down
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/ci/ci_create_tasks.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ ENV DEBIAN_FRONTEND noninteractive
timezone=timezone,
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/add_distribution_repositories.Dockerfile.em',
Expand Down
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/ci/create_workspace.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ ENV DEBIAN_FRONTEND noninteractive
timezone=timezone,
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/add_distribution_repositories.Dockerfile.em',
Expand Down
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/devel/devel_create_reconfigure_task.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ ENV DEBIAN_FRONTEND noninteractive
timezone=timezone,
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/add_distribution_repositories.Dockerfile.em',
Expand Down
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/devel/devel_create_tasks.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ ENV DEBIAN_FRONTEND noninteractive
timezone=timezone,
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@[if require_gpu_support]@
@(TEMPLATE(
Expand Down
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/devel/devel_task.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ ENV DEBIAN_FRONTEND noninteractive
timezone=timezone,
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/setup_nvidia_docker2.Dockerfile.em'
Expand Down
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/doc/doc_create_reconfigure_task.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ ENV DEBIAN_FRONTEND noninteractive
timezone=timezone,
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/add_distribution_repositories.Dockerfile.em',
Expand Down
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/doc/doc_create_task.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ ENV DEBIAN_FRONTEND noninteractive
timezone=timezone,
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/add_distribution_repositories.Dockerfile.em',
Expand Down
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/doc/doc_independent_task.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ ENV DEBIAN_FRONTEND noninteractive
timezone=timezone,
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/add_distribution_repositories.Dockerfile.em',
Expand Down
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/doc/doc_metadata_task.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ ENV DEBIAN_FRONTEND noninteractive
timezone=timezone,
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/add_distribution_repositories.Dockerfile.em',
Expand Down
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/doc/doc_task.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ ENV DEBIAN_FRONTEND noninteractive
timezone=timezone,
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/set_environment_variables.Dockerfile.em',
Expand Down
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/doc/rosdoc2_create_task.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ ENV DEBIAN_FRONTEND noninteractive
timezone=timezone,
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/add_distribution_repositories.Dockerfile.em',
Expand Down
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/doc/rosdoc2_task.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ ENV DEBIAN_FRONTEND noninteractive
timezone=timezone,
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/add_distribution_repositories.Dockerfile.em',
Expand Down
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/misc/rosdistro_cache_task.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ ENV DEBIAN_FRONTEND noninteractive
timezone=timezone,
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/add_distribution_repositories.Dockerfile.em',
Expand Down
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/release/deb/binarypkg_create_task.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ ENV DEBIAN_FRONTEND noninteractive
))@


RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/add_distribution_repositories.Dockerfile.em',
Expand Down
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/release/deb/binarypkg_task.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ ENV DEBIAN_FRONTEND noninteractive
bazelrc_dir='/etc',
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/add_distribution_repositories.Dockerfile.em',
Expand Down
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/release/deb/sourcepkg_task.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ ENV DEBIAN_FRONTEND noninteractive
timezone=timezone,
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/add_distribution_repositories.Dockerfile.em',
Expand Down
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/release/release_check_sync_criteria_task.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ ENV DEBIAN_FRONTEND noninteractive
timezone=timezone,
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/add_distribution_repositories.Dockerfile.em',
Expand Down
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/release/release_create_reconfigure_task.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ ENV DEBIAN_FRONTEND noninteractive
timezone=timezone,
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/add_distribution_repositories.Dockerfile.em',
Expand Down
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/release/release_create_trigger_task.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ ENV DEBIAN_FRONTEND noninteractive
timezone=timezone,
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/add_distribution_repositories.Dockerfile.em',
Expand Down
2 changes: 2 additions & 0 deletions ros_buildfarm/templates/snippet/add_buildfarm_user.Dockerfile.em
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Add user 'buildfarm', removing any existing user with that UID
RUN if [ $(id -nu @(uid)) ]; then userdel -r $(id -nu @(uid)); fi && useradd -u @(uid) -l -m buildfarm
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/status/blocked_releases_page_task.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ ENV DEBIAN_FRONTEND noninteractive
timezone=timezone,
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/add_distribution_repositories.Dockerfile.em',
Expand Down
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/status/blocked_source_entries_page_task.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ ENV DEBIAN_FRONTEND noninteractive
timezone=timezone,
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/add_distribution_repositories.Dockerfile.em',
Expand Down
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/status/release_compare_page_task.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ ENV DEBIAN_FRONTEND noninteractive
timezone=timezone,
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/add_distribution_repositories.Dockerfile.em',
Expand Down
5 changes: 4 additions & 1 deletion ros_buildfarm/templates/status/release_status_page_task.Dockerfile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ ENV DEBIAN_FRONTEND noninteractive
timezone=timezone,
))@

RUN useradd -u @uid -l -m buildfarm
@(TEMPLATE(
'snippet/add_buildfarm_user.Dockerfile.em',
uid=uid,
))@

@(TEMPLATE(
'snippet/add_distribution_repositories.Dockerfile.em',
Expand Down

0 comments on commit a64bf04

Please sign in to comment.