make - autocommit

2024-12-24 13:45:32 +03:00 · 2022-09-09 19:41:59 +03:00 · 2022-09-09 19:41:59 +03:00 · 9115093d6c
commit 9115093d6c
parent 9c60b25322
7 changed files with 46 additions and 54 deletions
--- a/linux/ecosystem/epicmorg/debian/06-squeeze/main/Dockerfile
+++ b/linux/ecosystem/epicmorg/debian/06-squeeze/main/Dockerfile
@ -111,30 +111,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
    xfsprogs \
    xfsdump

-##################################################################
-#                   git-lfs official binary
-##################################################################
-#RUN curl -s https://packagecloud.io/github/git-lfs/gpgkey | sudo gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/git-lfs.gpg --import && \
-#RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157 && \
-#    rm -rfv /etc/apt/sources.list.d/github_git-lfs.list
-#COPY etc/apt/sources.list.d/github_git-lfs.list /etc/apt/sources.list.d/github_git-lfs.list
-#RUN apt-get update &&  \
-#    apt-get install -y --allow-unauthenticated \
-#    git \
-#    git-lfs && \
-#    git --version && \
-#    git-lfs --version
-
-##################################################################
-#                   gh official binary
-##################################################################
-#RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C99B11DEB97541F0
-#COPY etc/apt/sources.list.d/github-cli.list /etc/apt/sources.list.d/github-cli.list
-#RUN apt-get update &&  \
-#    apt-get install -y --allow-unauthenticated \
-#    gh && \
-#    gh --version
-
 ##################################################################
 #                   Install p4client
 ##################################################################
--- a/linux/ecosystem/epicmorg/debian/07-wheezy/main/Dockerfile
+++ b/linux/ecosystem/epicmorg/debian/07-wheezy/main/Dockerfile
@ -118,6 +118,17 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
    xfsprogs \
    xfsdump

+##################################################################
+#                   gh official binary
+##################################################################
+RUN wget -c https://cli.github.com/packages/githubcli-archive-keyring.gpg -O /etc/apt/trusted.gpg.d/githubcli-archive-keyring.gpg && \
+    chmod go+r /etc/apt/trusted.gpg.d/githubcli-archive-keyring.gpg && \
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/trusted.gpg.d/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list && \
+    apt-get update &&  \
+    apt-get install -y --allow-unauthenticated \
+    gh && \
+    gh --version
+
 ##################################################################
 #                   Install p4client
 ##################################################################
--- a/linux/ecosystem/epicmorg/debian/08-jessie/main/Dockerfile
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/main/Dockerfile
@ -140,12 +140,13 @@ RUN apt-get update &&  \
 ##################################################################
 #                   gh official binary
 ##################################################################
-#RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C99B11DEB97541F0
-#COPY etc/apt/sources.list.d/github-cli.list /etc/apt/sources.list.d/github-cli.list
-#RUN apt-get update &&  \
-#    apt-get install -y --allow-unauthenticated \
-#    gh && \
-#    gh --version
+RUN wget -c https://cli.github.com/packages/githubcli-archive-keyring.gpg -O /etc/apt/trusted.gpg.d/githubcli-archive-keyring.gpg && \
+    chmod go+r /etc/apt/trusted.gpg.d/githubcli-archive-keyring.gpg && \
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/trusted.gpg.d/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list && \
+    apt-get update &&  \
+    apt-get install -y --allow-unauthenticated \
+    gh && \
+    gh --version

 ##################################################################
 #                   Install p4client
--- a/linux/ecosystem/epicmorg/debian/09-stretch/main/Dockerfile
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/main/Dockerfile
@ -155,12 +155,13 @@ RUN apt-get update &&  \
 ##################################################################
 #                   gh official binary
 ##################################################################
-#RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C99B11DEB97541F0
-#COPY etc/apt/sources.list.d/github-cli.list /etc/apt/sources.list.d/github-cli.list
-#RUN apt-get update &&  \
-#    apt-get install -y --allow-unauthenticated \
-#    gh && \
-#    gh --version
+RUN wget -c https://cli.github.com/packages/githubcli-archive-keyring.gpg -O /etc/apt/trusted.gpg.d/githubcli-archive-keyring.gpg && \
+    chmod go+r /etc/apt/trusted.gpg.d/githubcli-archive-keyring.gpg && \
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/trusted.gpg.d/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list && \
+    apt-get update &&  \
+    apt-get install -y --allow-unauthenticated \
+    gh && \
+    gh --version

 ##################################################################
 #                   Install p4client
--- a/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile
+++ b/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile
@ -157,12 +157,13 @@ RUN apt-get update &&  \
 ##################################################################
 #                   gh official binary
 ##################################################################
-#RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C99B11DEB97541F0
-#COPY etc/apt/sources.list.d/github-cli.list /etc/apt/sources.list.d/github-cli.list
-#RUN apt-get update &&  \
-#    apt-get install -y --allow-unauthenticated \
-#    gh && \
-#    gh --version
+RUN wget -c https://cli.github.com/packages/githubcli-archive-keyring.gpg -O /etc/apt/trusted.gpg.d/githubcli-archive-keyring.gpg && \
+    chmod go+r /etc/apt/trusted.gpg.d/githubcli-archive-keyring.gpg && \
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/trusted.gpg.d/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list && \
+    apt-get update &&  \
+    apt-get install -y --allow-unauthenticated \
+    gh && \
+    gh --version

 ##################################################################
 #                   Install p4client
--- a/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile
@ -155,12 +155,13 @@ RUN apt-get update &&  \
 ##################################################################
 #                   gh official binary
 ##################################################################
-#RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C99B11DEB97541F0
-#COPY etc/apt/sources.list.d/github-cli.list /etc/apt/sources.list.d/github-cli.list
-#RUN apt-get update &&  \
-#    apt-get install -y --allow-unauthenticated \
-#    gh && \
-#    gh --version
+RUN wget -c https://cli.github.com/packages/githubcli-archive-keyring.gpg -O /etc/apt/trusted.gpg.d/githubcli-archive-keyring.gpg && \
+    chmod go+r /etc/apt/trusted.gpg.d/githubcli-archive-keyring.gpg && \
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/trusted.gpg.d/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list && \
+    apt-get update &&  \
+    apt-get install -y --allow-unauthenticated \
+    gh && \
+    gh --version

 ##################################################################
 #                   Install p4client
--- a/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile
@ -155,12 +155,13 @@ RUN apt-get update &&  \
 ##################################################################
 #                   gh official binary
 ##################################################################
-#RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C99B11DEB97541F0
-#COPY etc/apt/sources.list.d/github-cli.list /etc/apt/sources.list.d/github-cli.list
-#RUN apt-get update &&  \
-#    apt-get install -y --allow-unauthenticated \
-#    gh && \
-#    gh --version
+RUN wget -c https://cli.github.com/packages/githubcli-archive-keyring.gpg -O /etc/apt/trusted.gpg.d/githubcli-archive-keyring.gpg && \
+    chmod go+r /etc/apt/trusted.gpg.d/githubcli-archive-keyring.gpg && \
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/trusted.gpg.d/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list && \
+    apt-get update &&  \
+    apt-get install -y --allow-unauthenticated \
+    gh && \
+    gh --version

 ##################################################################
 #                   Install p4client