From 8b4686ba7bed83efb019729808e085f6a2760188 Mon Sep 17 00:00:00 2001
From: Svetlana Maltseva <5437289+leo-ri@users.noreply.github.com>
Date: Tue, 26 Jan 2021 19:58:57 +0300
Subject: [PATCH] GHA: alpine

---
 .github/actions/create-pr/Dockerfile  | 10 +++++-----
 .github/actions/push-files/Dockerfile | 11 ++++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/actions/create-pr/Dockerfile b/.github/actions/create-pr/Dockerfile
index 696ebaa86b..5f52c03ced 100644
--- a/.github/actions/create-pr/Dockerfile
+++ b/.github/actions/create-pr/Dockerfile
@@ -1,10 +1,10 @@
 FROM alpine/git:latest
 # Install GitHub CLI
-RUN mkdir /ghcli && \
-    cd /ghcli && \
-    wget http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/github-cli-1.3.1-r0.apk && \
-    apk update && \
-    apk add --allow-untrusted github-cli-1.3.1-r0.apk
+RUN apk update && \
+    apk add --no-cache libc6-compat
+RUN mkdir ghcli && cd ghcli && \
+    wget https://github.com/cli/cli/releases/download/v1.5.0/gh_1.5.0_linux_386.tar.gz -O ghcli.tar.gz --no-check-certificate  && \
+    tar --strip-components=1 -xf ghcli.tar.gz -C /usr/local
 
 # Copies your code file from your action repository to the filesystem path `/` of the container
 COPY entrypoint.sh /home/entrypoint.sh
diff --git a/.github/actions/push-files/Dockerfile b/.github/actions/push-files/Dockerfile
index 8720f24d11..df77188e5b 100644
--- a/.github/actions/push-files/Dockerfile
+++ b/.github/actions/push-files/Dockerfile
@@ -1,11 +1,12 @@
 #TODO change to alpine
-FROM ubuntu:18.04
+FROM alpine/git:latest
 
 # Install GitHub CLI
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends git wget
-RUN wget https://github.com/cli/cli/releases/download/v1.0.0/gh_1.0.0_linux_386.tar.gz -O ghcli.tar.gz --no-check-certificate  && \
-    tar --strip-components=1 -xf ghcli.tar.gz
+RUN apk update && \
+    apk add --no-cache libc6-compat
+RUN mkdir ghcli && cd ghcli && \
+    wget https://github.com/cli/cli/releases/download/v1.5.0/gh_1.5.0_linux_386.tar.gz -O ghcli.tar.gz --no-check-certificate  && \
+    tar --strip-components=1 -xf ghcli.tar.gz -C /usr/local
 
 # Copies your code file from your action repository to the filesystem path `/` of the container
 COPY entrypoint.sh /home/entrypoint.sh