From 9115093d6cae68f0627136899d95610d68b57d73 Mon Sep 17 00:00:00 2001 From: Zimovskii Anatolii Date: Fri, 9 Sep 2022 19:41:59 +0300 Subject: [PATCH] make - autocommit --- .../debian/06-squeeze/main/Dockerfile | 24 ------------------- .../epicmorg/debian/07-wheezy/main/Dockerfile | 11 +++++++++ .../epicmorg/debian/08-jessie/main/Dockerfile | 13 +++++----- .../debian/09-stretch/main/Dockerfile | 13 +++++----- .../epicmorg/debian/10-buster/main/Dockerfile | 13 +++++----- .../debian/11-bullseye/main/Dockerfile | 13 +++++----- .../debian/12-bookworm/main/Dockerfile | 13 +++++----- 7 files changed, 46 insertions(+), 54 deletions(-) diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/main/Dockerfile b/linux/ecosystem/epicmorg/debian/06-squeeze/main/Dockerfile index 8f26f072b..4f615e572 100644 --- 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 ################################################################## diff --git a/linux/ecosystem/epicmorg/debian/07-wheezy/main/Dockerfile b/linux/ecosystem/epicmorg/debian/07-wheezy/main/Dockerfile index b48e952b1..fa18d76a1 100644 --- 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 ################################################################## diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/main/Dockerfile b/linux/ecosystem/epicmorg/debian/08-jessie/main/Dockerfile index 87a837d09..c1676180d 100644 --- 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 diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/main/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/main/Dockerfile index fcd66eb4e..3327def51 100644 --- 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 diff --git a/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile index 8afb03b28..276f36f5b 100644 --- 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 diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile index a56530eeb..a2ea833a7 100644 --- 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 diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile index f49062a7b..2a27acdf5 100644 --- 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