From d1fa4da8897f94237e5c9c9ec27f73919dbc40c7 Mon Sep 17 00:00:00 2001 From: Zimovskii Anatolii Date: Fri, 20 Jan 2023 19:05:33 +0300 Subject: [PATCH] make - autocommit --- ...base.images.current.debian12.yml.disabled} | 0 CHANGELOG.md | 1 + Makefile | 2 +- .../electron-release-server/Dockerfile | 2 +- .../debian/06-squeeze/main/Dockerfile | 4 +-- .../epicmorg/debian/10-buster/main/Dockerfile | 13 +++++++++ .../launchpad_git-mainline.list | 3 ++ .../sources.list.d/launchpad_git-stable.list | 3 ++ .../debian/11-bullseye/main/Dockerfile | 29 ++++++++++++++----- .../launchpad_git-mainline.list | 3 ++ .../sources.list.d/launchpad_git-stable.list | 3 ++ .../debian/12-bookworm/main/Dockerfile | 13 +++++++++ .../launchpad_git-mainline.list | 3 ++ .../sources.list.d/launchpad_git-stable.list | 3 ++ .../epicmorg/python/main/2.7/Dockerfile | 13 +++++++++ .../launchpad_git-mainline.list | 3 ++ .../sources.list.d/launchpad_git-stable.list | 3 ++ .../epicmorg/python/main/3.10/Dockerfile | 13 +++++++++ .../launchpad_git-mainline.list | 3 ++ .../sources.list.d/launchpad_git-stable.list | 3 ++ .../epicmorg/python/main/3.11/Dockerfile | 13 +++++++++ .../launchpad_git-mainline.list | 3 ++ .../sources.list.d/launchpad_git-stable.list | 3 ++ .../epicmorg/python/main/3.12/Dockerfile | 13 +++++++++ .../launchpad_git-mainline.list | 3 ++ .../sources.list.d/launchpad_git-stable.list | 3 ++ .../epicmorg/python/main/3.6/Dockerfile | 13 +++++++++ .../launchpad_git-mainline.list | 3 ++ .../sources.list.d/launchpad_git-stable.list | 3 ++ .../epicmorg/python/main/3.7/Dockerfile | 13 +++++++++ .../launchpad_git-mainline.list | 3 ++ .../sources.list.d/launchpad_git-stable.list | 3 ++ .../epicmorg/python/main/3.8/Dockerfile | 13 +++++++++ .../launchpad_git-mainline.list | 3 ++ .../sources.list.d/launchpad_git-stable.list | 3 ++ .../epicmorg/python/main/3.9/Dockerfile | 13 +++++++++ .../launchpad_git-mainline.list | 3 ++ .../sources.list.d/launchpad_git-stable.list | 3 ++ linux/ecosystem/monero/monerod/Dockerfile | 2 +- linux/ecosystem/monero/p2pool/Dockerfile | 2 +- 40 files changed, 224 insertions(+), 14 deletions(-) rename .github/workflows/{epicmorg.base.images.current.debian12.yml => epicmorg.base.images.current.debian12.yml.disabled} (100%) create mode 100644 linux/ecosystem/epicmorg/debian/10-buster/main/etc/apt/sources.list.d/launchpad_git-mainline.list create mode 100644 linux/ecosystem/epicmorg/debian/10-buster/main/etc/apt/sources.list.d/launchpad_git-stable.list create mode 100644 linux/ecosystem/epicmorg/debian/11-bullseye/main/etc/apt/sources.list.d/launchpad_git-mainline.list create mode 100644 linux/ecosystem/epicmorg/debian/11-bullseye/main/etc/apt/sources.list.d/launchpad_git-stable.list create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/main/etc/apt/sources.list.d/launchpad_git-mainline.list create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/main/etc/apt/sources.list.d/launchpad_git-stable.list create mode 100644 linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list.d/launchpad_git-mainline.list create mode 100644 linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list.d/launchpad_git-stable.list create mode 100644 linux/ecosystem/epicmorg/python/main/3.10/etc/apt/sources.list.d/launchpad_git-mainline.list create mode 100644 linux/ecosystem/epicmorg/python/main/3.10/etc/apt/sources.list.d/launchpad_git-stable.list create mode 100644 linux/ecosystem/epicmorg/python/main/3.11/etc/apt/sources.list.d/launchpad_git-mainline.list create mode 100644 linux/ecosystem/epicmorg/python/main/3.11/etc/apt/sources.list.d/launchpad_git-stable.list create mode 100644 linux/ecosystem/epicmorg/python/main/3.12/etc/apt/sources.list.d/launchpad_git-mainline.list create mode 100644 linux/ecosystem/epicmorg/python/main/3.12/etc/apt/sources.list.d/launchpad_git-stable.list create mode 100644 linux/ecosystem/epicmorg/python/main/3.6/etc/apt/sources.list.d/launchpad_git-mainline.list create mode 100644 linux/ecosystem/epicmorg/python/main/3.6/etc/apt/sources.list.d/launchpad_git-stable.list create mode 100644 linux/ecosystem/epicmorg/python/main/3.7/etc/apt/sources.list.d/launchpad_git-mainline.list create mode 100644 linux/ecosystem/epicmorg/python/main/3.7/etc/apt/sources.list.d/launchpad_git-stable.list create mode 100644 linux/ecosystem/epicmorg/python/main/3.8/etc/apt/sources.list.d/launchpad_git-mainline.list create mode 100644 linux/ecosystem/epicmorg/python/main/3.8/etc/apt/sources.list.d/launchpad_git-stable.list create mode 100644 linux/ecosystem/epicmorg/python/main/3.9/etc/apt/sources.list.d/launchpad_git-mainline.list create mode 100644 linux/ecosystem/epicmorg/python/main/3.9/etc/apt/sources.list.d/launchpad_git-stable.list diff --git a/.github/workflows/epicmorg.base.images.current.debian12.yml b/.github/workflows/epicmorg.base.images.current.debian12.yml.disabled similarity index 100% rename from .github/workflows/epicmorg.base.images.current.debian12.yml rename to .github/workflows/epicmorg.base.images.current.debian12.yml.disabled diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ef9953c4..cb3c9f0ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ * added new `jira` releases * added new `bitbucket` releases * added new `confluence` releases + * fixed `git` binary sources ------------------------------------------------------------------- ## 2022 * `dec` diff --git a/Makefile b/Makefile index 30e74cb6c..4c4fe1cb3 100644 --- a/Makefile +++ b/Makefile @@ -242,7 +242,7 @@ ecosystem-debian-images: make ecosystem-debian-stretch-images make ecosystem-debian-buster-images make ecosystem-debian-bullseye-images - make ecosystem-debian-bookworm-images +# make ecosystem-debian-bookworm-images ecosystem-debian-squeeze-images: cd `pwd`/linux/ecosystem/epicmorg/debian/06-squeeze/slim && pwd && make build && make deploy diff --git a/linux/ecosystem/electron-release-server/Dockerfile b/linux/ecosystem/electron-release-server/Dockerfile index 7dfbe9f86..2f0e80e0b 100644 --- a/linux/ecosystem/electron-release-server/Dockerfile +++ b/linux/ecosystem/electron-release-server/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/nodejs:node10 +FROM epicmorg/nodejs:node12 RUN git clone https://github.com/ArekSredzki/electron-release-server.git /usr/src/electron-release-server && \ tree /usr/src/electron-release-server diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/main/Dockerfile b/linux/ecosystem/epicmorg/debian/06-squeeze/main/Dockerfile index 7bf66412d..fe957044c 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/main/Dockerfile @@ -5,8 +5,8 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # perforce client binary ################################################################## -ENV P4_VERSION=r22.1 -ENV P4_DOWNLOAD_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64/p4 +ARG P4_VERSION=r22.1 +ARG P4_DOWNLOAD_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64/p4 ################################################################## # update lists diff --git a/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile index a7ba9b473..04e9f04d1 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile @@ -139,6 +139,19 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio # xfsprogs \ # xfsdump +################################################################## +# git fresh binary +################################################################## +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A1715D88E1DF1F24 && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.list && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list +COPY etc/apt/sources.list.d/launchpad_git-mainline.list /etc/apt/sources.list.d/launchpad_git-mainline.list +COPY etc/apt/sources.list.d/launchpad_git-stable.list /etc/apt/sources.list.d/launchpad_git-stable.list +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + git && \ + git --version + ################################################################## # git-lfs official binary ################################################################## diff --git a/linux/ecosystem/epicmorg/debian/10-buster/main/etc/apt/sources.list.d/launchpad_git-mainline.list b/linux/ecosystem/epicmorg/debian/10-buster/main/etc/apt/sources.list.d/launchpad_git-mainline.list new file mode 100644 index 000000000..c48739d8d --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/10-buster/main/etc/apt/sources.list.d/launchpad_git-mainline.list @@ -0,0 +1,3 @@ +# mainline +deb https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main +deb-src https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main diff --git a/linux/ecosystem/epicmorg/debian/10-buster/main/etc/apt/sources.list.d/launchpad_git-stable.list b/linux/ecosystem/epicmorg/debian/10-buster/main/etc/apt/sources.list.d/launchpad_git-stable.list new file mode 100644 index 000000000..0f7803eaf --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/10-buster/main/etc/apt/sources.list.d/launchpad_git-stable.list @@ -0,0 +1,3 @@ +# stable +deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main +deb-src https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile index 134a4b7fd..5c3583b14 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile @@ -5,20 +5,20 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # perforce client binary ################################################################## -ENV P4_VERSION=r22.1 -ENV P4_DOWNLOAD_URL=https://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64/p4 +ARG P4_VERSION=r22.1 +ARG P4_DOWNLOAD_URL=https://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64/p4 ################################################################## # 7z official binary ################################################################## -ENV SZ_VERSION=7z2200 -ENV SZ_DOWNLOAD_URL=https://www.7-zip.org/a/${SZ_VERSION}-linux-x64.tar.xz +ARG SZ_VERSION=7z2200 +ARG SZ_DOWNLOAD_URL=https://www.7-zip.org/a/${SZ_VERSION}-linux-x64.tar.xz ################################################################## # LazyGit official binary ################################################################## -ENV LZGIT_VERSION=0.34 -ENV LZGIT_DOWNLOAD_URL=https://github.com/jesseduffield/lazygit/releases/download/v${LZGIT_VERSION}/lazygit_${LZGIT_VERSION}_Linux_x86_64.tar.gz +ARG LZGIT_VERSION=0.34 +ARG LZGIT_DOWNLOAD_URL=https://github.com/jesseduffield/lazygit/releases/download/v${LZGIT_VERSION}/lazygit_${LZGIT_VERSION}_Linux_x86_64.tar.gz ################################################################## # update lists @@ -138,6 +138,19 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio # xfsprogs \ # xfsdump +################################################################## +# git fresh binary +################################################################## +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A1715D88E1DF1F24 && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.list && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list +COPY etc/apt/sources.list.d/launchpad_git-mainline.list /etc/apt/sources.list.d/launchpad_git-mainline.list +COPY etc/apt/sources.list.d/launchpad_git-stable.list /etc/apt/sources.list.d/launchpad_git-stable.list +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + git && \ + git --version + ################################################################## # git-lfs official binary ################################################################## @@ -195,7 +208,7 @@ RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue ################################################################## # dumb init ################################################################## -ENV DUMB_INIT_VERSION=1.2.5 +ARG DUMB_INIT_VERSION=1.2.5 RUN wget -q --no-check-certificate -c https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_x86_64 --random-wait -O /usr/bin/dumb-init && \ chmod +x /usr/bin/dumb-init && \ dumb-init --version @@ -203,7 +216,7 @@ RUN wget -q --no-check-certificate -c https://github.com/Yelp/dumb-init/releases ################################################################## # grab gosu for easy step-down from root ################################################################## -ENV GOSU_VER 1.14 +ARG GOSU_VER 1.14 RUN wget -q --no-check-certificate -c https://github.com/tianon/gosu/releases/download/${GOSU_VER}/gosu-amd64 --random-wait -O /usr/local/bin/gosu && \ chmod +x /usr/local/bin/gosu && \ gosu --version diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/main/etc/apt/sources.list.d/launchpad_git-mainline.list b/linux/ecosystem/epicmorg/debian/11-bullseye/main/etc/apt/sources.list.d/launchpad_git-mainline.list new file mode 100644 index 000000000..c48739d8d --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/main/etc/apt/sources.list.d/launchpad_git-mainline.list @@ -0,0 +1,3 @@ +# mainline +deb https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main +deb-src https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/main/etc/apt/sources.list.d/launchpad_git-stable.list b/linux/ecosystem/epicmorg/debian/11-bullseye/main/etc/apt/sources.list.d/launchpad_git-stable.list new file mode 100644 index 000000000..0f7803eaf --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/main/etc/apt/sources.list.d/launchpad_git-stable.list @@ -0,0 +1,3 @@ +# stable +deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main +deb-src https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile index 02369dd62..6179adac0 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile @@ -138,6 +138,19 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio # xfsprogs ## xfsdump +################################################################## +# git fresh binary +################################################################## +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A1715D88E1DF1F24 && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.list && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list +COPY etc/apt/sources.list.d/launchpad_git-mainline.list /etc/apt/sources.list.d/launchpad_git-mainline.list +COPY etc/apt/sources.list.d/launchpad_git-stable.list /etc/apt/sources.list.d/launchpad_git-stable.list +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + git && \ + git --version + ################################################################## # git-lfs official binary ################################################################## diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/main/etc/apt/sources.list.d/launchpad_git-mainline.list b/linux/ecosystem/epicmorg/debian/12-bookworm/main/etc/apt/sources.list.d/launchpad_git-mainline.list new file mode 100644 index 000000000..43280b672 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/main/etc/apt/sources.list.d/launchpad_git-mainline.list @@ -0,0 +1,3 @@ +# mainline +deb https://ppa.launchpadcontent.net/git-core/candidate/ubuntu jammy main +deb-src https://ppa.launchpadcontent.net/git-core/candidate/ubuntu jammy main diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/main/etc/apt/sources.list.d/launchpad_git-stable.list b/linux/ecosystem/epicmorg/debian/12-bookworm/main/etc/apt/sources.list.d/launchpad_git-stable.list new file mode 100644 index 000000000..08f372cbc --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/main/etc/apt/sources.list.d/launchpad_git-stable.list @@ -0,0 +1,3 @@ +# stable +deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu jammy main +deb-src https://ppa.launchpadcontent.net/git-core/ppa/ubuntu jammy main diff --git a/linux/ecosystem/epicmorg/python/main/2.7/Dockerfile b/linux/ecosystem/epicmorg/python/main/2.7/Dockerfile index 38a02d4b5..7e81eca6b 100644 --- a/linux/ecosystem/epicmorg/python/main/2.7/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/2.7/Dockerfile @@ -188,6 +188,19 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio # xfsprogs \ # xfsdump +################################################################## +# git fresh binary +################################################################## +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A1715D88E1DF1F24 && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.list && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list +COPY etc/apt/sources.list.d/launchpad_git-mainline.list /etc/apt/sources.list.d/launchpad_git-mainline.list +COPY etc/apt/sources.list.d/launchpad_git-stable.list /etc/apt/sources.list.d/launchpad_git-stable.list +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + git && \ + git --version + ################################################################## # git-lfs official binary ################################################################## diff --git a/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list.d/launchpad_git-mainline.list b/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list.d/launchpad_git-mainline.list new file mode 100644 index 000000000..c48739d8d --- /dev/null +++ b/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list.d/launchpad_git-mainline.list @@ -0,0 +1,3 @@ +# mainline +deb https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main +deb-src https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main diff --git a/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list.d/launchpad_git-stable.list b/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list.d/launchpad_git-stable.list new file mode 100644 index 000000000..0f7803eaf --- /dev/null +++ b/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list.d/launchpad_git-stable.list @@ -0,0 +1,3 @@ +# stable +deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main +deb-src https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main diff --git a/linux/ecosystem/epicmorg/python/main/3.10/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.10/Dockerfile index 9d234a5bd..6e9f7c51a 100644 --- a/linux/ecosystem/epicmorg/python/main/3.10/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.10/Dockerfile @@ -192,6 +192,19 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio # xfsprogs \ # xfsdump +################################################################## +# git fresh binary +################################################################## +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A1715D88E1DF1F24 && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.list && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list +COPY etc/apt/sources.list.d/launchpad_git-mainline.list /etc/apt/sources.list.d/launchpad_git-mainline.list +COPY etc/apt/sources.list.d/launchpad_git-stable.list /etc/apt/sources.list.d/launchpad_git-stable.list +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + git && \ + git --version + ################################################################## # git-lfs official binary ################################################################## diff --git a/linux/ecosystem/epicmorg/python/main/3.10/etc/apt/sources.list.d/launchpad_git-mainline.list b/linux/ecosystem/epicmorg/python/main/3.10/etc/apt/sources.list.d/launchpad_git-mainline.list new file mode 100644 index 000000000..c48739d8d --- /dev/null +++ b/linux/ecosystem/epicmorg/python/main/3.10/etc/apt/sources.list.d/launchpad_git-mainline.list @@ -0,0 +1,3 @@ +# mainline +deb https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main +deb-src https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main diff --git a/linux/ecosystem/epicmorg/python/main/3.10/etc/apt/sources.list.d/launchpad_git-stable.list b/linux/ecosystem/epicmorg/python/main/3.10/etc/apt/sources.list.d/launchpad_git-stable.list new file mode 100644 index 000000000..0f7803eaf --- /dev/null +++ b/linux/ecosystem/epicmorg/python/main/3.10/etc/apt/sources.list.d/launchpad_git-stable.list @@ -0,0 +1,3 @@ +# stable +deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main +deb-src https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main diff --git a/linux/ecosystem/epicmorg/python/main/3.11/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.11/Dockerfile index 58030f809..cfe6ce933 100644 --- a/linux/ecosystem/epicmorg/python/main/3.11/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.11/Dockerfile @@ -183,6 +183,19 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio # xfsprogs \ # xfsdump +################################################################## +# git fresh binary +################################################################## +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A1715D88E1DF1F24 && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.list && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list +COPY etc/apt/sources.list.d/launchpad_git-mainline.list /etc/apt/sources.list.d/launchpad_git-mainline.list +COPY etc/apt/sources.list.d/launchpad_git-stable.list /etc/apt/sources.list.d/launchpad_git-stable.list +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + git && \ + git --version + ################################################################## # git-lfs official binary ################################################################## diff --git a/linux/ecosystem/epicmorg/python/main/3.11/etc/apt/sources.list.d/launchpad_git-mainline.list b/linux/ecosystem/epicmorg/python/main/3.11/etc/apt/sources.list.d/launchpad_git-mainline.list new file mode 100644 index 000000000..c48739d8d --- /dev/null +++ b/linux/ecosystem/epicmorg/python/main/3.11/etc/apt/sources.list.d/launchpad_git-mainline.list @@ -0,0 +1,3 @@ +# mainline +deb https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main +deb-src https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main diff --git a/linux/ecosystem/epicmorg/python/main/3.11/etc/apt/sources.list.d/launchpad_git-stable.list b/linux/ecosystem/epicmorg/python/main/3.11/etc/apt/sources.list.d/launchpad_git-stable.list new file mode 100644 index 000000000..0f7803eaf --- /dev/null +++ b/linux/ecosystem/epicmorg/python/main/3.11/etc/apt/sources.list.d/launchpad_git-stable.list @@ -0,0 +1,3 @@ +# stable +deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main +deb-src https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main diff --git a/linux/ecosystem/epicmorg/python/main/3.12/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.12/Dockerfile index 186540113..7b45fee2a 100644 --- a/linux/ecosystem/epicmorg/python/main/3.12/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.12/Dockerfile @@ -183,6 +183,19 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio # xfsprogs \ # xfsdump +################################################################## +# git fresh binary +################################################################## +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A1715D88E1DF1F24 && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.list && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list +COPY etc/apt/sources.list.d/launchpad_git-mainline.list /etc/apt/sources.list.d/launchpad_git-mainline.list +COPY etc/apt/sources.list.d/launchpad_git-stable.list /etc/apt/sources.list.d/launchpad_git-stable.list +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + git && \ + git --version + ################################################################## # git-lfs official binary ################################################################## diff --git a/linux/ecosystem/epicmorg/python/main/3.12/etc/apt/sources.list.d/launchpad_git-mainline.list b/linux/ecosystem/epicmorg/python/main/3.12/etc/apt/sources.list.d/launchpad_git-mainline.list new file mode 100644 index 000000000..c48739d8d --- /dev/null +++ b/linux/ecosystem/epicmorg/python/main/3.12/etc/apt/sources.list.d/launchpad_git-mainline.list @@ -0,0 +1,3 @@ +# mainline +deb https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main +deb-src https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main diff --git a/linux/ecosystem/epicmorg/python/main/3.12/etc/apt/sources.list.d/launchpad_git-stable.list b/linux/ecosystem/epicmorg/python/main/3.12/etc/apt/sources.list.d/launchpad_git-stable.list new file mode 100644 index 000000000..0f7803eaf --- /dev/null +++ b/linux/ecosystem/epicmorg/python/main/3.12/etc/apt/sources.list.d/launchpad_git-stable.list @@ -0,0 +1,3 @@ +# stable +deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main +deb-src https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main diff --git a/linux/ecosystem/epicmorg/python/main/3.6/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.6/Dockerfile index 08eb973e6..b5f7f182f 100644 --- a/linux/ecosystem/epicmorg/python/main/3.6/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.6/Dockerfile @@ -183,6 +183,19 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio # xfsprogs \ # xfsdump +################################################################## +# git fresh binary +################################################################## +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A1715D88E1DF1F24 && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.list && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list +COPY etc/apt/sources.list.d/launchpad_git-mainline.list /etc/apt/sources.list.d/launchpad_git-mainline.list +COPY etc/apt/sources.list.d/launchpad_git-stable.list /etc/apt/sources.list.d/launchpad_git-stable.list +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + git && \ + git --version + ################################################################## # git-lfs official binary ################################################################## diff --git a/linux/ecosystem/epicmorg/python/main/3.6/etc/apt/sources.list.d/launchpad_git-mainline.list b/linux/ecosystem/epicmorg/python/main/3.6/etc/apt/sources.list.d/launchpad_git-mainline.list new file mode 100644 index 000000000..c48739d8d --- /dev/null +++ b/linux/ecosystem/epicmorg/python/main/3.6/etc/apt/sources.list.d/launchpad_git-mainline.list @@ -0,0 +1,3 @@ +# mainline +deb https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main +deb-src https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main diff --git a/linux/ecosystem/epicmorg/python/main/3.6/etc/apt/sources.list.d/launchpad_git-stable.list b/linux/ecosystem/epicmorg/python/main/3.6/etc/apt/sources.list.d/launchpad_git-stable.list new file mode 100644 index 000000000..0f7803eaf --- /dev/null +++ b/linux/ecosystem/epicmorg/python/main/3.6/etc/apt/sources.list.d/launchpad_git-stable.list @@ -0,0 +1,3 @@ +# stable +deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main +deb-src https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main diff --git a/linux/ecosystem/epicmorg/python/main/3.7/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.7/Dockerfile index 4b2e4dcf8..7ff80877b 100644 --- a/linux/ecosystem/epicmorg/python/main/3.7/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.7/Dockerfile @@ -183,6 +183,19 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio # xfsprogs \ # xfsdump +################################################################## +# git fresh binary +################################################################## +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A1715D88E1DF1F24 && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.list && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list +COPY etc/apt/sources.list.d/launchpad_git-mainline.list /etc/apt/sources.list.d/launchpad_git-mainline.list +COPY etc/apt/sources.list.d/launchpad_git-stable.list /etc/apt/sources.list.d/launchpad_git-stable.list +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + git && \ + git --version + ################################################################## # git-lfs official binary ################################################################## diff --git a/linux/ecosystem/epicmorg/python/main/3.7/etc/apt/sources.list.d/launchpad_git-mainline.list b/linux/ecosystem/epicmorg/python/main/3.7/etc/apt/sources.list.d/launchpad_git-mainline.list new file mode 100644 index 000000000..c48739d8d --- /dev/null +++ b/linux/ecosystem/epicmorg/python/main/3.7/etc/apt/sources.list.d/launchpad_git-mainline.list @@ -0,0 +1,3 @@ +# mainline +deb https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main +deb-src https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main diff --git a/linux/ecosystem/epicmorg/python/main/3.7/etc/apt/sources.list.d/launchpad_git-stable.list b/linux/ecosystem/epicmorg/python/main/3.7/etc/apt/sources.list.d/launchpad_git-stable.list new file mode 100644 index 000000000..0f7803eaf --- /dev/null +++ b/linux/ecosystem/epicmorg/python/main/3.7/etc/apt/sources.list.d/launchpad_git-stable.list @@ -0,0 +1,3 @@ +# stable +deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main +deb-src https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main diff --git a/linux/ecosystem/epicmorg/python/main/3.8/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.8/Dockerfile index 1dabd72fe..cc20c4020 100644 --- a/linux/ecosystem/epicmorg/python/main/3.8/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.8/Dockerfile @@ -183,6 +183,19 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio # xfsprogs \ # xfsdump +################################################################## +# git fresh binary +################################################################## +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A1715D88E1DF1F24 && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.list && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list +COPY etc/apt/sources.list.d/launchpad_git-mainline.list /etc/apt/sources.list.d/launchpad_git-mainline.list +COPY etc/apt/sources.list.d/launchpad_git-stable.list /etc/apt/sources.list.d/launchpad_git-stable.list +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + git && \ + git --version + ################################################################## # git-lfs official binary ################################################################## diff --git a/linux/ecosystem/epicmorg/python/main/3.8/etc/apt/sources.list.d/launchpad_git-mainline.list b/linux/ecosystem/epicmorg/python/main/3.8/etc/apt/sources.list.d/launchpad_git-mainline.list new file mode 100644 index 000000000..c48739d8d --- /dev/null +++ b/linux/ecosystem/epicmorg/python/main/3.8/etc/apt/sources.list.d/launchpad_git-mainline.list @@ -0,0 +1,3 @@ +# mainline +deb https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main +deb-src https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main diff --git a/linux/ecosystem/epicmorg/python/main/3.8/etc/apt/sources.list.d/launchpad_git-stable.list b/linux/ecosystem/epicmorg/python/main/3.8/etc/apt/sources.list.d/launchpad_git-stable.list new file mode 100644 index 000000000..0f7803eaf --- /dev/null +++ b/linux/ecosystem/epicmorg/python/main/3.8/etc/apt/sources.list.d/launchpad_git-stable.list @@ -0,0 +1,3 @@ +# stable +deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main +deb-src https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main diff --git a/linux/ecosystem/epicmorg/python/main/3.9/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.9/Dockerfile index 0543b7199..7b196ba60 100644 --- a/linux/ecosystem/epicmorg/python/main/3.9/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.9/Dockerfile @@ -183,6 +183,19 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio # xfsprogs \ # xfsdump +################################################################## +# git fresh binary +################################################################## +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A1715D88E1DF1F24 && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.list && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list +COPY etc/apt/sources.list.d/launchpad_git-mainline.list /etc/apt/sources.list.d/launchpad_git-mainline.list +COPY etc/apt/sources.list.d/launchpad_git-stable.list /etc/apt/sources.list.d/launchpad_git-stable.list +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + git && \ + git --version + ################################################################## # git-lfs official binary ################################################################## diff --git a/linux/ecosystem/epicmorg/python/main/3.9/etc/apt/sources.list.d/launchpad_git-mainline.list b/linux/ecosystem/epicmorg/python/main/3.9/etc/apt/sources.list.d/launchpad_git-mainline.list new file mode 100644 index 000000000..c48739d8d --- /dev/null +++ b/linux/ecosystem/epicmorg/python/main/3.9/etc/apt/sources.list.d/launchpad_git-mainline.list @@ -0,0 +1,3 @@ +# mainline +deb https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main +deb-src https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main diff --git a/linux/ecosystem/epicmorg/python/main/3.9/etc/apt/sources.list.d/launchpad_git-stable.list b/linux/ecosystem/epicmorg/python/main/3.9/etc/apt/sources.list.d/launchpad_git-stable.list new file mode 100644 index 000000000..0f7803eaf --- /dev/null +++ b/linux/ecosystem/epicmorg/python/main/3.9/etc/apt/sources.list.d/launchpad_git-stable.list @@ -0,0 +1,3 @@ +# stable +deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main +deb-src https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main diff --git a/linux/ecosystem/monero/monerod/Dockerfile b/linux/ecosystem/monero/monerod/Dockerfile index aa2872fd3..af4a0b084 100644 --- a/linux/ecosystem/monero/monerod/Dockerfile +++ b/linux/ecosystem/monero/monerod/Dockerfile @@ -8,7 +8,7 @@ ARG DEBIAN_FRONTEND=noninteractive ENV MONERO_DIR=/monero ENV MONERO_BIN=${MONERO_DIR}/bin ENV MONERO_DATA=${MONERO_DIR}/data -ENV MONERO_VERSION=0.18.1.0 +ENV MONERO_VERSION=0.18.1.2 ENV MONERO_DOWNLOAD_URL=https://downloads.getmonero.org/cli/monero-linux-x64-v${MONERO_VERSION}.tar.bz2 ENV PATH="${PATH}:${MONERO_BIN}" diff --git a/linux/ecosystem/monero/p2pool/Dockerfile b/linux/ecosystem/monero/p2pool/Dockerfile index d2d1a323c..6f0da803c 100644 --- a/linux/ecosystem/monero/p2pool/Dockerfile +++ b/linux/ecosystem/monero/p2pool/Dockerfile @@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive # ARGuments ################################################################## ENV P2POOL_DIR=/p2pool -ENV P2POOL_VERSION=2.3 +ENV P2POOL_VERSION=2.7 ENV P2POOL_DOWNLOAD_URL=https://github.com/SChernykh/p2pool/releases/download/v${P2POOL_VERSION}/p2pool-v${P2POOL_VERSION}-linux-x64.tar.gz ##################################################################