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

Extend template to install packages from lockfiles #667

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Extend template to install packages from lockfiles #667

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
d7853f1
Refactor configs to actually use empy
ruffsl Mar 21, 2023
e9416a9
Pass archs directly to os_code_data
ruffsl Mar 21, 2023
81f8ff9
Update legacy config using archs
ruffsl Mar 22, 2023
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
20 changes: 10 additions & 10 deletions ros/.config/legacy/ros1/Makefile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
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 ""
@@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=ros:$release_name-ros-$os_code_name ros/.
@@docker build --tag=ros:@release_name-ros-@os_code_name ros/.

pull:
@docker pull ros:$release_name-ros-$os_code_name
@@docker pull ros:@release_name-ros-@os_code_name

clean:
@docker rmi -f ros:$release_name-ros-$os_code_name
@@docker rmi -f ros:@release_name-ros-@os_code_name
10 changes: 6 additions & 4 deletions ros/.config/legacy/ros1/platform.yaml.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
# ROS Dockerfile database
---
platform:
os_name: $os_name
os_code_name: $os_code_name
rosdistro_name: $release_name
os_name: @os_name
os_code_name: @os_code_name
rosdistro_name: @release_name
user_name: ros
maintainer_name:
arch: amd64
archs:
- @('\n - '.join(archs))@

type: distribution
version: False
release: ros
Expand Down
54 changes: 27 additions & 27 deletions ros/.config/legacy/ros2/Makefile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
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 ""
@@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=ros:$release_name-ros-core-$os_code_name ros-core/.
@docker build --tag=ros:$release_name-ros-base-$os_code_name ros-base/.
@docker build --tag=ros:$release_name-ros1-bridge-$os_code_name ros1-bridge/.
# @docker build --tag=osrf/ros:$release_name-desktop-$os_code_name desktop/.
@@docker build --tag=ros:@release_name-ros-core-@os_code_name ros-core/.
@@docker build --tag=ros:@release_name-ros-base-@os_code_name ros-base/.
@@docker build --tag=ros:@release_name-ros1-bridge-@os_code_name ros1-bridge/.
# @@docker build --tag=osrf/ros:@release_name-desktop-@os_code_name desktop/.

pull:
@docker pull ros:$release_name-ros-core-$os_code_name
@docker pull ros:$release_name-ros-base-$os_code_name
@docker pull ros:$release_name-ros1-bridge-$os_code_name
# @docker pull osrf/ros:$release_name-desktop-$os_code_name
@@docker pull ros:@release_name-ros-core-@os_code_name
@@docker pull ros:@release_name-ros-base-@os_code_name
@@docker pull ros:@release_name-ros1-bridge-@os_code_name
# @@docker pull osrf/ros:@release_name-desktop-@os_code_name

clean:
@docker rmi -f ros:$release_name-ros-core-$os_code_name
@docker rmi -f ros:$release_name-ros-base-$os_code_name
@docker rmi -f ros:$release_name-ros1-bridge-$os_code_name
# @docker rmi -f osrf/ros:$release_name-desktop-$os_code_name
@@docker rmi -f ros:@release_name-ros-core-@os_code_name
@@docker rmi -f ros:@release_name-ros-base-@os_code_name
@@docker rmi -f ros:@release_name-ros1-bridge-@os_code_name
# @@docker rmi -f osrf/ros:@release_name-desktop-@os_code_name

ci_buildx:
@docker buildx build --pull --push \
--cache-from=type=registry,ref=osrf/ros:$release_name-desktop-$os_code_name \
@@docker buildx build --pull --push \
--cache-from=type=registry,ref=osrf/ros:@release_name-desktop-@os_code_name \
--cache-to=type=inline \
--tag=osrf/ros:$release_name-desktop-$os_code_name \
--tag=osrf/ros:@release_name-desktop-@os_code_name \
desktop/.
@if [ "$os_name" = "ubuntu" ]; then \
@@if [ "@os_name" = "ubuntu" ]; then \
docker pull \
osrf/ros:$release_name-desktop-$os_code_name; \
osrf/ros:@release_name-desktop-@os_code_name; \
docker tag \
osrf/ros:$release_name-desktop-$os_code_name \
osrf/ros:$release_name-desktop; \
osrf/ros:@release_name-desktop-@os_code_name \
osrf/ros:@release_name-desktop; \
docker push \
osrf/ros:$release_name-desktop; \
osrf/ros:@release_name-desktop; \
fi
12 changes: 7 additions & 5 deletions ros/.config/legacy/ros2/platform.yaml.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
# ROS2 Dockerfile database
---
platform:
os_name: $os_name
os_code_name: $os_code_name
rosdistro_name: $rosdistro_name
ros2distro_name: $release_name
os_name: @os_name
os_code_name: @os_code_name
rosdistro_name: @rosdistro_name
ros2distro_name: @release_name
user_name: ros
maintainer_name:
arch: amd64
archs:
- @('\n - '.join(archs))@

type: distribution
version:
82 changes: 41 additions & 41 deletions ros/.config/ros1/Makefile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,64 +1,64 @@
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 ""
@@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=ros:$release_name-ros-core-$os_code_name ros-core/.
@docker build --tag=ros:$release_name-ros-base-$os_code_name ros-base/.
@docker build --tag=ros:$release_name-robot-$os_code_name robot/.
@docker build --tag=ros:$release_name-perception-$os_code_name perception/.
# @docker build --tag=osrf/ros:$release_name-desktop-$os_code_name desktop/.
# @docker build --tag=osrf/ros:$release_name-desktop-full-$os_code_name desktop-full/.
@@docker build --tag=ros:@release_name-ros-core-@os_code_name ros-core/.
@@docker build --tag=ros:@release_name-ros-base-@os_code_name ros-base/.
@@docker build --tag=ros:@release_name-robot-@os_code_name robot/.
@@docker build --tag=ros:@release_name-perception-@os_code_name perception/.
# @@docker build --tag=osrf/ros:@release_name-desktop-@os_code_name desktop/.
# @@docker build --tag=osrf/ros:@release_name-desktop-full-@os_code_name desktop-full/.

pull:
@docker pull ros:$release_name-ros-core-$os_code_name
@docker pull ros:$release_name-ros-base-$os_code_name
@docker pull ros:$release_name-robot-$os_code_name
@docker pull ros:$release_name-perception-$os_code_name
# @docker pull osrf/ros:$release_name-desktop-$os_code_name
# @docker pull osrf/ros:$release_name-desktop-full-$os_code_name
@@docker pull ros:@release_name-ros-core-@os_code_name
@@docker pull ros:@release_name-ros-base-@os_code_name
@@docker pull ros:@release_name-robot-@os_code_name
@@docker pull ros:@release_name-perception-@os_code_name
# @@docker pull osrf/ros:@release_name-desktop-@os_code_name
# @@docker pull osrf/ros:@release_name-desktop-full-@os_code_name

clean:
@docker rmi -f ros:$release_name-ros-core-$os_code_name
@docker rmi -f ros:$release_name-ros-base-$os_code_name
@docker rmi -f ros:$release_name-robot-$os_code_name
@docker rmi -f ros:$release_name-perception-$os_code_name
# @docker rmi -f osrf/ros:$release_name-desktop-$os_code_name
# @docker rmi -f osrf/ros:$release_name-desktop-full-$os_code_name
@@docker rmi -f ros:@release_name-ros-core-@os_code_name
@@docker rmi -f ros:@release_name-ros-base-@os_code_name
@@docker rmi -f ros:@release_name-robot-@os_code_name
@@docker rmi -f ros:@release_name-perception-@os_code_name
# @@docker rmi -f osrf/ros:@release_name-desktop-@os_code_name
# @@docker rmi -f osrf/ros:@release_name-desktop-full-@os_code_name

ci_buildx:
@docker buildx build --pull --push \
--cache-from=type=registry,ref=osrf/ros:$release_name-desktop-$os_code_name \
@@docker buildx build --pull --push \
--cache-from=type=registry,ref=osrf/ros:@release_name-desktop-@os_code_name \
--cache-to=type=inline \
--tag=osrf/ros:$release_name-desktop-$os_code_name \
--tag=osrf/ros:@release_name-desktop-@os_code_name \
desktop/.
@if [ "$os_name" = "ubuntu" ]; then \
@@if [ "@os_name" = "ubuntu" ]; then \
docker pull \
osrf/ros:$release_name-desktop-$os_code_name; \
osrf/ros:@release_name-desktop-@os_code_name; \
docker tag \
osrf/ros:$release_name-desktop-$os_code_name \
osrf/ros:$release_name-desktop; \
osrf/ros:@release_name-desktop-@os_code_name \
osrf/ros:@release_name-desktop; \
docker push \
osrf/ros:$release_name-desktop; \
osrf/ros:@release_name-desktop; \
fi
@docker buildx build --pull --push \
--cache-from=type=registry,ref=osrf/ros:$release_name-desktop-full-$os_code_name \
@@docker buildx build --pull --push \
--cache-from=type=registry,ref=osrf/ros:@release_name-desktop-full-@os_code_name \
--cache-to=type=inline \
--tag=osrf/ros:$release_name-desktop-full-$os_code_name \
--tag=osrf/ros:@release_name-desktop-full-@os_code_name \
desktop-full/.
@if [ "$os_name" = "ubuntu" ]; then \
@@if [ "@os_name" = "ubuntu" ]; then \
docker pull \
osrf/ros:$release_name-desktop-full-$os_code_name; \
osrf/ros:@release_name-desktop-full-@os_code_name; \
docker tag \
osrf/ros:$release_name-desktop-full-$os_code_name \
osrf/ros:$release_name-desktop-full; \
osrf/ros:@release_name-desktop-full-@os_code_name \
osrf/ros:@release_name-desktop-full; \
docker push \
osrf/ros:$release_name-desktop-full; \
osrf/ros:@release_name-desktop-full; \
fi
10 changes: 6 additions & 4 deletions ros/.config/ros1/platform.yaml.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
# ROS Dockerfile database
---
platform:
os_name: $os_name
os_code_name: $os_code_name
rosdistro_name: $release_name
os_name: @os_name
os_code_name: @os_code_name
rosdistro_name: @release_name
user_name: ros
maintainer_name:
arch: amd64
archs:
- @('\n - '.join(archs))@

type: distribution
version:
98 changes: 49 additions & 49 deletions ros/.config/ros2/Makefile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,78 +1,78 @@
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 ""
@@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=ros:$release_name-ros-core-$os_code_name ros-core/.
@docker build --tag=ros:$release_name-ros-base-$os_code_name ros-base/.
@docker build --tag=ros:$release_name-perception-$os_code_name perception/.
# @docker build --tag=osrf/ros:$release_name-simulation-$os_code_name simulation/.
# @docker build --tag=osrf/ros:$release_name-desktop-$os_code_name desktop/.
# @docker build --tag=osrf/ros:$release_name-desktop-full-$os_code_name desktop-full/.
@@docker build --tag=ros:@release_name-ros-core-@os_code_name ros-core/.
@@docker build --tag=ros:@release_name-ros-base-@os_code_name ros-base/.
@@docker build --tag=ros:@release_name-perception-@os_code_name perception/.
# @@docker build --tag=osrf/ros:@release_name-simulation-@os_code_name simulation/.
# @@docker build --tag=osrf/ros:@release_name-desktop-@os_code_name desktop/.
# @@docker build --tag=osrf/ros:@release_name-desktop-full-@os_code_name desktop-full/.

pull:
@docker pull ros:$release_name-ros-core-$os_code_name
@docker pull ros:$release_name-ros-base-$os_code_name
@docker pull ros:$release_name-perception-$os_code_name
# @docker pull osrf/ros:$release_name-simulation-$os_code_name
# @docker pull osrf/ros:$release_name-desktop-$os_code_name
# @docker pull osrf/ros:$release_name-desktop-full-$os_code_name
@@docker pull ros:@release_name-ros-core-@os_code_name
@@docker pull ros:@release_name-ros-base-@os_code_name
@@docker pull ros:@release_name-perception-@os_code_name
# @@docker pull osrf/ros:@release_name-simulation-@os_code_name
# @@docker pull osrf/ros:@release_name-desktop-@os_code_name
# @@docker pull osrf/ros:@release_name-desktop-full-@os_code_name

clean:
@docker rmi -f ros:$release_name-ros-core-$os_code_name
@docker rmi -f ros:$release_name-ros-base-$os_code_name
@docker rmi -f ros:$release_name-perception-$os_code_name
# @docker rmi -f osrf/ros:$release_name-simulation-$os_code_name
# @docker rmi -f osrf/ros:$release_name-desktop-$os_code_name
# @docker rmi -f osrf/ros:$release_name-desktop-full-$os_code_name
@@docker rmi -f ros:@release_name-ros-core-@os_code_name
@@docker rmi -f ros:@release_name-ros-base-@os_code_name
@@docker rmi -f ros:@release_name-perception-@os_code_name
# @@docker rmi -f osrf/ros:@release_name-simulation-@os_code_name
# @@docker rmi -f osrf/ros:@release_name-desktop-@os_code_name
# @@docker rmi -f osrf/ros:@release_name-desktop-full-@os_code_name

ci_buildx:
@docker buildx build --pull --push \
--cache-from=type=registry,ref=osrf/ros:$release_name-desktop-$os_code_name \
@@docker buildx build --pull --push \
--cache-from=type=registry,ref=osrf/ros:@release_name-desktop-@os_code_name \
--cache-to=type=inline \
--tag=osrf/ros:$release_name-desktop-$os_code_name \
--tag=osrf/ros:@release_name-desktop-@os_code_name \
desktop/.
@if [ "$os_name" = "ubuntu" ]; then \
@@if [ "@os_name" = "ubuntu" ]; then \
docker pull \
osrf/ros:$release_name-desktop-$os_code_name; \
osrf/ros:@release_name-desktop-@os_code_name; \
docker tag \
osrf/ros:$release_name-desktop-$os_code_name \
osrf/ros:$release_name-desktop; \
osrf/ros:@release_name-desktop-@os_code_name \
osrf/ros:@release_name-desktop; \
docker push \
osrf/ros:$release_name-desktop; \
osrf/ros:@release_name-desktop; \
fi
@docker buildx build --pull --push \
--cache-from=type=registry,ref=osrf/ros:$release_name-simulation-$os_code_name \
@@docker buildx build --pull --push \
--cache-from=type=registry,ref=osrf/ros:@release_name-simulation-@os_code_name \
--cache-to=type=inline \
--tag=osrf/ros:$release_name-simulation-$os_code_name \
--tag=osrf/ros:@release_name-simulation-@os_code_name \
simulation/.
@if [ "$os_name" = "ubuntu" ]; then \
@@if [ "@os_name" = "ubuntu" ]; then \
docker pull \
osrf/ros:$release_name-simulation-$os_code_name; \
osrf/ros:@release_name-simulation-@os_code_name; \
docker tag \
osrf/ros:$release_name-simulation-$os_code_name \
osrf/ros:$release_name-simulation; \
osrf/ros:@release_name-simulation-@os_code_name \
osrf/ros:@release_name-simulation; \
docker push \
osrf/ros:$release_name-simulation; \
osrf/ros:@release_name-simulation; \
fi
@docker buildx build --pull --push \
--cache-from=type=registry,ref=osrf/ros:$release_name-desktop-full-$os_code_name \
@@docker buildx build --pull --push \
--cache-from=type=registry,ref=osrf/ros:@release_name-desktop-full-@os_code_name \
--cache-to=type=inline \
--tag=osrf/ros:$release_name-desktop-full-$os_code_name \
--tag=osrf/ros:@release_name-desktop-full-@os_code_name \
desktop-full/.
@if [ "$os_name" = "ubuntu" ]; then \
@@if [ "@os_name" = "ubuntu" ]; then \
docker pull \
osrf/ros:$release_name-desktop-full-$os_code_name; \
osrf/ros:@release_name-desktop-full-@os_code_name; \
docker tag \
osrf/ros:$release_name-desktop-full-$os_code_name \
osrf/ros:$release_name-desktop-full; \
osrf/ros:@release_name-desktop-full-@os_code_name \
osrf/ros:@release_name-desktop-full; \
docker push \
osrf/ros:$release_name-desktop-full; \
osrf/ros:@release_name-desktop-full; \
fi
Loading