From f4980a71fceeeec654e45bf3e4fe7255d201b7c5 Mon Sep 17 00:00:00 2001 From: Anatolii Zimovskii Date: Wed, 15 Dec 2021 19:01:31 +0300 Subject: [PATCH] updates --- CHANGELOG.md | 2 ++ .../atlassian/confluence/latest/Dockerfile | 2 +- .../confluence/latest/Dockerfile.jdk11 | 2 +- linux/ecosystem/atlassian/jira/latest/.env | 4 ++-- linux/ecosystem/epicmorg/prod/main/Dockerfile | 20 ++++++++++++++++++- linux/ecosystem/nginx/latest/main/.env | 2 +- linux/ecosystem/nginx/latest/php/.env | 2 +- linux/ecosystem/nginx/latest/rtmp-hls/.env | 2 +- 8 files changed, 28 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90fb9761b..2c975b150 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## Changelog ### 2021 +* `december` + * added `git-lfs`, `lazygit`, bumped versions of nginx, jira, conflunce and bitbucket. * `october-november` * added `nginx:quic` image. UNSTABLE. * added `redash:latest` image in to `advanced` pack. diff --git a/linux/ecosystem/atlassian/confluence/latest/Dockerfile b/linux/ecosystem/atlassian/confluence/latest/Dockerfile index a0bf14609..33bbca38a 100644 --- a/linux/ecosystem/atlassian/confluence/latest/Dockerfile +++ b/linux/ecosystem/atlassian/confluence/latest/Dockerfile @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=7.13.1 +ARG CONFLUENCE_VERSION=7.15.0 ARG DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz ################################################################## diff --git a/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk11 b/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk11 index cd8c3c562..eb52ba98a 100644 --- a/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk11 @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=7.13.1 +ARG CONFLUENCE_VERSION=7.15.0 ARG DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz ################################################################## diff --git a/linux/ecosystem/atlassian/jira/latest/.env b/linux/ecosystem/atlassian/jira/latest/.env index 0aaefcf4d..7a3eda920 100644 --- a/linux/ecosystem/atlassian/jira/latest/.env +++ b/linux/ecosystem/atlassian/jira/latest/.env @@ -1,3 +1,3 @@ -RELEASE=8.17.1 -DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-8.17.1.tar.gz +RELEASE=8.21.0 +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-8.21.0.tar.gz diff --git a/linux/ecosystem/epicmorg/prod/main/Dockerfile b/linux/ecosystem/epicmorg/prod/main/Dockerfile index e849863c1..732091b22 100644 --- a/linux/ecosystem/epicmorg/prod/main/Dockerfile +++ b/linux/ecosystem/epicmorg/prod/main/Dockerfile @@ -24,6 +24,12 @@ ENV P4_DOWNLOAD_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bi ENV SZ_VERSION=7z2103 ENV SZ_DOWNLOAD_URL=https://www.7-zip.org/a/${SZ_VERSION}-linux-x64.tar.xz +################################################################## +# LazyGit official binary +################################################################## +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 ################################################################## @@ -47,6 +53,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio ffmpeg \ fontconfig \ git \ + git-lfs \ gnupg \ gnupg2 \ graphicsmagick \ @@ -115,6 +122,16 @@ RUN wget -nv --random-wait -c -O /tmp/7z.tar.xz ${SZ_DOWNLOAD_URL} && \ 7zz | head -4 && \ 7z | head -4 +################################################################## +# Install LazyGit official binary +################################################################## +RUN wget -nv --random-wait -c -O /tmp/lazygit.tar.xz ${LZGIT_DOWNLOAD_URL} && \ + mkdir -p /tmp/lazygit && \ + tar -zxvf /tmp/lazygit.tar.xz -C /tmp/lazygit && \ + chmod +x /tmp/lazygit/lazygit && \ + mv -fv /tmp/lazygit/lazygit /usr/bin/ && \ + lazygit --version + ################################################################## # Generate ssl key ################################################################## @@ -129,4 +146,5 @@ RUN apt purge policykit-1 -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /tmp/mc.patch && \ rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /tmp/7z + rm -rfv /tmp/7z && \ + rm -rfv /tmp/lazygit diff --git a/linux/ecosystem/nginx/latest/main/.env b/linux/ecosystem/nginx/latest/main/.env index 00230635f..7de73fe60 100644 --- a/linux/ecosystem/nginx/latest/main/.env +++ b/linux/ecosystem/nginx/latest/main/.env @@ -1,2 +1,2 @@ NGINX_VERSION=latest -NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.3.tar.gz +NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.4.tar.gz diff --git a/linux/ecosystem/nginx/latest/php/.env b/linux/ecosystem/nginx/latest/php/.env index 00230635f..7de73fe60 100644 --- a/linux/ecosystem/nginx/latest/php/.env +++ b/linux/ecosystem/nginx/latest/php/.env @@ -1,2 +1,2 @@ NGINX_VERSION=latest -NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.3.tar.gz +NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.4.tar.gz diff --git a/linux/ecosystem/nginx/latest/rtmp-hls/.env b/linux/ecosystem/nginx/latest/rtmp-hls/.env index 00230635f..7de73fe60 100644 --- a/linux/ecosystem/nginx/latest/rtmp-hls/.env +++ b/linux/ecosystem/nginx/latest/rtmp-hls/.env @@ -1,2 +1,2 @@ NGINX_VERSION=latest -NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.3.tar.gz +NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.4.tar.gz