Skip to content

Commit

Permalink
Add 3.20 noetic (#85)
Browse files Browse the repository at this point in the history
  • Loading branch information
at-wat authored Jun 4, 2024
1 parent b39bfbf commit 151b847
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 6 deletions.
1 change: 1 addition & 0 deletions .github/workflows/update.impl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
env:
- ROS_DISTRO=noetic ALPINE_VERSION=3.17 ROS_DISTRIBUTION_TYPE=ros1
- ROS_DISTRO=humble ALPINE_VERSION=3.17 ROS_DISTRIBUTION_TYPE=ros2
- ROS_DISTRO=noetic ALPINE_VERSION=3.20 ROS_DISTRIBUTION_TYPE=ros1
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
31 changes: 26 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# syntax=docker/dockerfile:1

ARG ALPINE_VERSION=3.17

# ========================================
Expand All @@ -11,11 +13,30 @@ RUN wget https://github.com/cli/cli/releases/download/v2.29.0/gh_2.29.0_linux_am
FROM alpine:${ALPINE_VERSION}
ARG ALPINE_VERSION=3.17

RUN apk add --no-cache python3 py3-pip py3-yaml git curl findutils \
&& pip3 install \
git+https://github.com/alpine-ros/ros-abuild-docker.git \
rosdep \
rosinstall_generator
RUN echo "http://alpine-ros.seqsense.org/v${ALPINE_VERSION}/backports" >> /etc/apk/repositories
COPY <<EOF /etc/apk/keys/[email protected]
-----BEGIN PUBLIC KEY-----
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnSO+a+rIaTorOowj3c8e
5St89puiGJ54QmOW9faDsTcIWhycl4bM5lftp8IdcpKadcnaihwLtMLeaHNJvMIP
XrgEEoaPzEuvLf6kF4IN8HJoFGDhmuW4lTuJNfsOIDWtLBH0EN+3lPuCPmNkULeo
iS3Sdjz10eB26TYiM9pbMQnm7zPnDSYSLm9aCy+gumcoyCt1K1OY3A9E3EayYdk1
9nk9IQKA3vgdPGCEh+kjAjnmVxwV72rDdEwie0RkIyJ/al3onRLAfN4+FGkX2CFb
a17OJ4wWWaPvOq8PshcTZ2P3Me8kTCWr/fczjzq+8hB0MNEqfuENoSyZhmCypEuy
ewIDAQAB
-----END PUBLIC KEY-----
EOF

RUN apk add --no-cache \
curl \
findutils \
git \
py3-pip \
py3-rosdep \
py3-rosinstall-generator \
py3-yaml \
python3 \
&& pip3 install $([ "${ALPINE_VERSION}" != '3.17' ] && echo -n '--break-system-packages') \
git+https://github.com/alpine-ros/ros-abuild-docker.git

RUN rosdep init \
&& sed -i -e 's|ros/rosdistro/master|alpine-ros/rosdistro/alpine-custom-apk|' \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
UPDATER_NAME = aports-ros-updater
ALPINE_VERSION ?= 3.17
ALPINE_VERSION ?= 3.20
ROS_DISTRO ?= noetic
ROS_PYTHON_VERSION ?= 3
ROS_DISTRIBUTION_TYPE ?= ros1
Expand Down

0 comments on commit 151b847

Please sign in to comment.