diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c975b150..9663faedd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ### 2021 * `december` * added `git-lfs`, `lazygit`, bumped versions of nginx, jira, conflunce and bitbucket. + * added another git addons + * added `gh` - `github-cli` support * `october-november` * added `nginx:quic` image. UNSTABLE. * added `redash:latest` image in to `advanced` pack. diff --git a/linux/ecosystem/epicmorg/edge/main/github_git-lfs.list b/linux/ecosystem/epicmorg/edge/main/github_git-lfs.list new file mode 100644 index 000000000..8cf93d426 --- /dev/null +++ b/linux/ecosystem/epicmorg/edge/main/github_git-lfs.list @@ -0,0 +1,2 @@ +deb https://packagecloud.io/github/git-lfs/debian/ bullseye main +deb-src https://packagecloud.io/github/git-lfs/debian/ bullseye main diff --git a/linux/ecosystem/epicmorg/prod/main/Dockerfile b/linux/ecosystem/epicmorg/prod/main/Dockerfile index 8407863b1..25945cac0 100644 --- a/linux/ecosystem/epicmorg/prod/main/Dockerfile +++ b/linux/ecosystem/epicmorg/prod/main/Dockerfile @@ -30,7 +30,6 @@ ENV SZ_DOWNLOAD_URL=https://www.7-zip.org/a/${SZ_VERSION}-linux-x64.tar.xz ENV LZGIT_VERSION=0.31.4 ENV LZGIT_DOWNLOAD_URL=https://github.com/jesseduffield/lazygit/releases/download/v${LZGIT_VERSION}/lazygit_${LZGIT_VERSION}_Linux_x86_64.tar.gz - ################################################################## # installing utils ################################################################## @@ -54,7 +53,16 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio ffmpeg \ fontconfig \ git \ + git-extras \ + git-flow \ + git-cvs \ + git-doc \ + git-email \ + git-mediawiki \ + git-crypt \ git-lfs \ + git-ftp \ + git-hub \ gnupg \ gnupg2 \ graphicsmagick \ @@ -107,15 +115,27 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio zip ################################################################## -# git-lfs official binary +# gh official binary ################################################################## -RUN curl -L https://packagecloud.io/github/git-lfs/gpgkey | apt-key add - && \ +RUN curl -L https://cli.github.com/packages/githubcli-archive-keyring.gpg | apt-key add - && \ rm -rfv /etc/apt/sources.list.d/github_git-lfs.list COPY 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-lfs && \ + git --version && \ + git-lfs --version + +################################################################## +# git-lfs official binary +################################################################## +RUN curl -L https://packagecloud.io/github/git-lfs/gpgkey | apt-key add - +COPY 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/prod/main/github-cli.list b/linux/ecosystem/epicmorg/prod/main/github-cli.list new file mode 100644 index 000000000..4442663ff --- /dev/null +++ b/linux/ecosystem/epicmorg/prod/main/github-cli.list @@ -0,0 +1 @@ +deb https://cli.github.com/packages stable main