Skip to content

Commit

Permalink
Merge pull request #776 from osrf/use_key_equals_value
Browse files Browse the repository at this point in the history
ENV and ARG should use key=value format
  • Loading branch information
mikaelarguedas authored Oct 31, 2024
2 parents e0f7cdb + 107c810 commit 9c64fd4
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions ros/humble/ubuntu/jammy/ros-core/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ RUN set -eux; \
RUN echo "deb [ signed-by=/usr/share/keyrings/ros2-latest-archive-keyring.gpg ] http://packages.ros.org/ros2/ubuntu jammy main" > /etc/apt/sources.list.d/ros2-latest.list

# setup environment
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
ENV LANG=C.UTF-8
ENV LC_ALL=C.UTF-8

ENV ROS_DISTRO humble
ENV ROS_DISTRO=humble

# install ros2 packages
RUN apt-get update && apt-get install -y --no-install-recommends \
Expand Down
6 changes: 3 additions & 3 deletions ros/iron/ubuntu/jammy/ros-core/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ RUN set -eux; \
RUN echo "deb [ signed-by=/usr/share/keyrings/ros2-latest-archive-keyring.gpg ] http://packages.ros.org/ros2/ubuntu jammy main" > /etc/apt/sources.list.d/ros2-latest.list

# setup environment
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
ENV LANG=C.UTF-8
ENV LC_ALL=C.UTF-8

ENV ROS_DISTRO iron
ENV ROS_DISTRO=iron

# install ros2 packages
RUN apt-get update && apt-get install -y --no-install-recommends \
Expand Down
6 changes: 3 additions & 3 deletions ros/jazzy/ubuntu/noble/ros-core/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ RUN set -eux; \
RUN echo "deb [ signed-by=/usr/share/keyrings/ros2-latest-archive-keyring.gpg ] http://packages.ros.org/ros2/ubuntu noble main" > /etc/apt/sources.list.d/ros2-latest.list

# setup environment
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
ENV LANG=C.UTF-8
ENV LC_ALL=C.UTF-8

ENV ROS_DISTRO jazzy
ENV ROS_DISTRO=jazzy

# install ros2 packages
RUN apt-get update && apt-get install -y --no-install-recommends \
Expand Down
6 changes: 3 additions & 3 deletions ros/noetic/ubuntu/focal/ros-core/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ RUN set -eux; \
RUN echo "deb [ signed-by=/usr/share/keyrings/ros1-latest-archive-keyring.gpg ] http://packages.ros.org/ros/ubuntu focal main" > /etc/apt/sources.list.d/ros1-latest.list

# setup environment
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
ENV LANG=C.UTF-8
ENV LC_ALL=C.UTF-8

ENV ROS_DISTRO noetic
ENV ROS_DISTRO=noetic

# install ros packages
RUN apt-get update && apt-get install -y --no-install-recommends \
Expand Down
6 changes: 3 additions & 3 deletions ros/rolling/ubuntu/noble/ros-core/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ RUN set -eux; \
RUN echo "deb [ signed-by=/usr/share/keyrings/ros2-latest-archive-keyring.gpg ] http://packages.ros.org/ros2/ubuntu noble main" > /etc/apt/sources.list.d/ros2-latest.list

# setup environment
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
ENV LANG=C.UTF-8
ENV LC_ALL=C.UTF-8

ENV ROS_DISTRO rolling
ENV ROS_DISTRO=rolling

# install ros2 packages
RUN apt-get update && apt-get install -y --no-install-recommends \
Expand Down
10 changes: 5 additions & 5 deletions ros/ros
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GitRepo: https://github.com/osrf/docker_images.git

Tags: noetic-ros-core, noetic-ros-core-focal
Architectures: amd64, arm32v7, arm64v8
GitCommit: 27cc0b68263bbbb10bb58dd814efc0a6b0a01ec7
GitCommit: 0ebcf40b638509a1ddaeb171259f789060cbcf0e
Directory: ros/noetic/ubuntu/focal/ros-core

Tags: noetic-ros-base, noetic-ros-base-focal, noetic
Expand All @@ -36,7 +36,7 @@ Directory: ros/noetic/ubuntu/focal/perception

Tags: humble-ros-core, humble-ros-core-jammy
Architectures: amd64, arm64v8
GitCommit: 27cc0b68263bbbb10bb58dd814efc0a6b0a01ec7
GitCommit: 0ebcf40b638509a1ddaeb171259f789060cbcf0e
Directory: ros/humble/ubuntu/jammy/ros-core

Tags: humble-ros-base, humble-ros-base-jammy, humble
Expand All @@ -58,7 +58,7 @@ Directory: ros/humble/ubuntu/jammy/perception

Tags: iron-ros-core, iron-ros-core-jammy
Architectures: amd64, arm64v8
GitCommit: 27cc0b68263bbbb10bb58dd814efc0a6b0a01ec7
GitCommit: 0ebcf40b638509a1ddaeb171259f789060cbcf0e
Directory: ros/iron/ubuntu/jammy/ros-core

Tags: iron-ros-base, iron-ros-base-jammy, iron
Expand All @@ -80,7 +80,7 @@ Directory: ros/iron/ubuntu/jammy/perception

Tags: jazzy-ros-core, jazzy-ros-core-noble
Architectures: amd64, arm64v8
GitCommit: 74e321bc1837c29f223a6d54895aa3c8eb184119
GitCommit: 0ebcf40b638509a1ddaeb171259f789060cbcf0e
Directory: ros/jazzy/ubuntu/noble/ros-core

Tags: jazzy-ros-base, jazzy-ros-base-noble, jazzy, latest
Expand All @@ -102,7 +102,7 @@ Directory: ros/jazzy/ubuntu/noble/perception

Tags: rolling-ros-core, rolling-ros-core-noble
Architectures: amd64, arm64v8
GitCommit: 7f98ddd88d872299c45b60c8bcd70d4eb6665222
GitCommit: 0ebcf40b638509a1ddaeb171259f789060cbcf0e
Directory: ros/rolling/ubuntu/noble/ros-core

Tags: rolling-ros-base, rolling-ros-base-noble, rolling
Expand Down

0 comments on commit 9c64fd4

Please sign in to comment.