From ab8dae59dfa9d5a1678c003484f62277d5ba7066 Mon Sep 17 00:00:00 2001
From: Atsushi Watanabe <atsushi.w@ieee.org>
Date: Tue, 16 Jul 2024 14:25:11 +0900
Subject: [PATCH 1/2] Install gh by apk

---
 Dockerfile | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d39aa10..10d9fca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,13 +2,6 @@
 
 ARG ALPINE_VERSION=3.17
 
-# ========================================
-FROM alpine:${ALPINE_VERSION} as gh-downloader
-
-RUN wget https://github.com/cli/cli/releases/download/v2.29.0/gh_2.29.0_linux_amd64.tar.gz -O - \
-    | tar xzfv - \
-  && mv gh_* gh
-
 # ========================================
 FROM alpine:${ALPINE_VERSION}
 ARG ALPINE_VERSION=3.17
@@ -30,6 +23,7 @@ RUN apk add --no-cache \
     curl \
     findutils \
     git \
+    gh \
     py3-pip \
     py3-rosdep \
     py3-rosinstall-generator \
@@ -42,10 +36,6 @@ RUN rosdep init \
   && sed -i -e 's|ros/rosdistro/master|alpine-ros/rosdistro/alpine-custom-apk|' \
     /etc/ros/rosdep/sources.list.d/20-default.list
 
-# TODO: use `apk add --no-cache gh` after dropping Melodic
-COPY --from=gh-downloader /gh/bin/gh /usr/local/bin/
-RUN gh --version
-
 ENV HOME="/root"
 
 ARG ROS_DISTRO="noetic"

From ffb78914c551424c4b7b8147e34cebf8e7406ff2 Mon Sep 17 00:00:00 2001
From: Atsushi Watanabe <atsushi.w@ieee.org>
Date: Tue, 16 Jul 2024 14:26:54 +0900
Subject: [PATCH 2/2] Fix alpine package name

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 10d9fca..09a79a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ RUN apk add --no-cache \
     curl \
     findutils \
     git \
-    gh \
+    github-cli \
     py3-pip \
     py3-rosdep \
     py3-rosinstall-generator \