From aa85d9c3db8a6de533e811b79effec61605ba215 Mon Sep 17 00:00:00 2001 From: Zimovskii Anatolii Date: Fri, 9 Sep 2022 19:58:47 +0300 Subject: [PATCH 1/5] fixes --- linux/ecosystem/epicmorg/debian/06-squeeze/slim/Dockerfile | 2 +- linux/ecosystem/epicmorg/debian/07-wheezy/slim/Dockerfile | 2 +- linux/ecosystem/epicmorg/debian/08-jessie/slim/Dockerfile | 2 +- linux/ecosystem/epicmorg/debian/09-stretch/slim/Dockerfile | 4 +++- linux/ecosystem/epicmorg/debian/10-buster/slim/Dockerfile | 4 +++- linux/ecosystem/epicmorg/debian/11-bullseye/slim/Dockerfile | 4 +++- linux/ecosystem/epicmorg/debian/12-bookworm/slim/Dockerfile | 4 +++- linux/ecosystem/epicmorg/python/main/2.7/Dockerfile | 4 ++-- linux/ecosystem/epicmorg/python/main/3.10/Dockerfile | 2 ++ linux/ecosystem/epicmorg/python/main/3.11/Dockerfile | 3 ++- linux/ecosystem/epicmorg/python/main/3.6/Dockerfile | 3 ++- linux/ecosystem/epicmorg/python/main/3.7/Dockerfile | 3 ++- linux/ecosystem/epicmorg/python/main/3.8/Dockerfile | 3 ++- linux/ecosystem/epicmorg/python/main/3.9/Dockerfile | 3 ++- 14 files changed, 29 insertions(+), 14 deletions(-) diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/slim/Dockerfile b/linux/ecosystem/epicmorg/debian/06-squeeze/slim/Dockerfile index 2d235f953..e597fc83c 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/slim/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/slim/Dockerfile @@ -42,7 +42,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio # software-properties \ sudo -RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys +RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys RUN apt-key adv --keyserver keyserver.ubuntu.com --refresh-keys RUN update-ca-certificates diff --git a/linux/ecosystem/epicmorg/debian/07-wheezy/slim/Dockerfile b/linux/ecosystem/epicmorg/debian/07-wheezy/slim/Dockerfile index b4b003c19..aa216b974 100644 --- a/linux/ecosystem/epicmorg/debian/07-wheezy/slim/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/07-wheezy/slim/Dockerfile @@ -42,7 +42,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio software-properties-common \ sudo -RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys +RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys RUN apt-key adv --keyserver keyserver.ubuntu.com --refresh-keys RUN update-ca-certificates diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/slim/Dockerfile b/linux/ecosystem/epicmorg/debian/08-jessie/slim/Dockerfile index 6fa4fc7f9..ba90321b4 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/slim/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/08-jessie/slim/Dockerfile @@ -41,7 +41,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio software-properties-common \ sudo -RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys +RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys RUN apt-key adv --keyserver keyserver.ubuntu.com --refresh-keys RUN update-ca-certificates diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/slim/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/slim/Dockerfile index c03b7629e..c11b091fa 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/slim/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/09-stretch/slim/Dockerfile @@ -42,7 +42,9 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio sudo RUN apt-key adv --keyserver keyserver.ubuntu.com --refresh-keys -RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys +RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys + +RUN update-ca-certificates ################################################################## # update locales diff --git a/linux/ecosystem/epicmorg/debian/10-buster/slim/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/slim/Dockerfile index d035d9e50..e76681b96 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/slim/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/slim/Dockerfile @@ -42,7 +42,9 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio sudo RUN apt-key adv --keyserver keyserver.ubuntu.com --refresh-keys -RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys +RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys + +RUN update-ca-certificates ################################################################## # update locales diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/slim/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/slim/Dockerfile index 07b0039f0..3b1cb19dd 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/slim/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/slim/Dockerfile @@ -42,7 +42,9 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio sudo RUN apt-key adv --keyserver keyserver.ubuntu.com --refresh-keys -RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys +RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys + +RUN update-ca-certificates ################################################################## # update locales diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/slim/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/slim/Dockerfile index 30005b1bd..511b1d610 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/slim/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/slim/Dockerfile @@ -42,7 +42,9 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio sudo RUN apt-key adv --keyserver keyserver.ubuntu.com --refresh-keys -RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys +RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys + +RUN update-ca-certificates ################################################################## # update locales diff --git a/linux/ecosystem/epicmorg/python/main/2.7/Dockerfile b/linux/ecosystem/epicmorg/python/main/2.7/Dockerfile index 6e15b3313..bbd475424 100644 --- a/linux/ecosystem/epicmorg/python/main/2.7/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/2.7/Dockerfile @@ -23,7 +23,6 @@ RUN apt-get update && \ apt-get upgrade -y && \ apt-get dist-upgrade -y - ################################################################## # Version ################################################################## @@ -52,6 +51,8 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio RUN apt-key adv --keyserver keyserver.ubuntu.com --refresh-keys RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys +RUN update-ca-certificates + ################################################################## # perforce client binary ################################################################## @@ -162,7 +163,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio subversion-tools \ pev - ################################################################## # installing fs-tools ################################################################## diff --git a/linux/ecosystem/epicmorg/python/main/3.10/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.10/Dockerfile index d49117261..7af2b4782 100644 --- a/linux/ecosystem/epicmorg/python/main/3.10/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.10/Dockerfile @@ -54,6 +54,8 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio RUN apt-key adv --keyserver keyserver.ubuntu.com --refresh-keys RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys +RUN update-ca-certificates + ################################################################## # perforce client binary ################################################################## diff --git a/linux/ecosystem/epicmorg/python/main/3.11/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.11/Dockerfile index 112aadbb8..c15103645 100644 --- a/linux/ecosystem/epicmorg/python/main/3.11/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.11/Dockerfile @@ -45,6 +45,8 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio RUN apt-key adv --keyserver keyserver.ubuntu.com --refresh-keys RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys +RUN update-ca-certificates + ################################################################## # perforce client binary ################################################################## @@ -156,7 +158,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio subversion-tools \ pev - ################################################################## # installing fs-tools ################################################################## diff --git a/linux/ecosystem/epicmorg/python/main/3.6/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.6/Dockerfile index a4885851a..16fcf0e3b 100644 --- a/linux/ecosystem/epicmorg/python/main/3.6/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.6/Dockerfile @@ -45,6 +45,8 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio RUN apt-key adv --keyserver keyserver.ubuntu.com --refresh-keys RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys +RUN update-ca-certificates + ################################################################## # perforce client binary ################################################################## @@ -156,7 +158,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio subversion-tools \ pev - ################################################################## # installing fs-tools ################################################################## diff --git a/linux/ecosystem/epicmorg/python/main/3.7/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.7/Dockerfile index a191d894a..0bbe718f7 100644 --- a/linux/ecosystem/epicmorg/python/main/3.7/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.7/Dockerfile @@ -45,6 +45,8 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio RUN apt-key adv --keyserver keyserver.ubuntu.com --refresh-keys RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys +RUN update-ca-certificates + ################################################################## # perforce client binary ################################################################## @@ -156,7 +158,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio subversion-tools \ pev - ################################################################## # installing fs-tools ################################################################## diff --git a/linux/ecosystem/epicmorg/python/main/3.8/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.8/Dockerfile index 9c3a8fd26..81bee341e 100644 --- a/linux/ecosystem/epicmorg/python/main/3.8/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.8/Dockerfile @@ -45,6 +45,8 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio RUN apt-key adv --keyserver keyserver.ubuntu.com --refresh-keys RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys +RUN update-ca-certificates + ################################################################## # perforce client binary ################################################################## @@ -156,7 +158,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio subversion-tools \ pev - ################################################################## # installing fs-tools ################################################################## diff --git a/linux/ecosystem/epicmorg/python/main/3.9/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.9/Dockerfile index 1bfe6a342..040e57441 100644 --- a/linux/ecosystem/epicmorg/python/main/3.9/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.9/Dockerfile @@ -45,6 +45,8 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio RUN apt-key adv --keyserver keyserver.ubuntu.com --refresh-keys RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys +RUN update-ca-certificates + ################################################################## # perforce client binary ################################################################## @@ -156,7 +158,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio subversion-tools \ pev - ################################################################## # installing fs-tools ################################################################## From bc34090d74a9084d4d8dd226e03bc08f7ecd4cd6 Mon Sep 17 00:00:00 2001 From: Zimovskii Anatolii Date: Fri, 9 Sep 2022 20:32:16 +0300 Subject: [PATCH 2/5] make - autocommit --- .../epicmorg/debian/10-buster/main/Dockerfile | 1 - linux/ecosystem/epicmorg/python/main/2.7/Dockerfile | 7 ++++--- .../epicmorg/python/main/2.7/etc/apt/sources.list | 11 ++++------- .../main/2.7/etc/apt/sources.list.d/github-cli.list | 1 - linux/ecosystem/epicmorg/python/main/3.10/Dockerfile | 7 ++++--- .../epicmorg/python/main/3.10/etc/apt/sources.list | 10 ++-------- .../main/3.10/etc/apt/sources.list.d/github-cli.list | 1 - linux/ecosystem/epicmorg/python/main/3.11/Dockerfile | 7 ++++--- .../epicmorg/python/main/3.11/etc/apt/sources.list | 10 ++-------- .../main/3.11/etc/apt/sources.list.d/github-cli.list | 1 - linux/ecosystem/epicmorg/python/main/3.6/Dockerfile | 7 ++++--- .../epicmorg/python/main/3.6/etc/apt/sources.list | 10 ++-------- .../main/3.6/etc/apt/sources.list.d/github-cli.list | 1 - linux/ecosystem/epicmorg/python/main/3.7/Dockerfile | 7 ++++--- .../epicmorg/python/main/3.7/etc/apt/sources.list | 10 ++-------- .../main/3.7/etc/apt/sources.list.d/github-cli.list | 1 - linux/ecosystem/epicmorg/python/main/3.8/Dockerfile | 7 ++++--- .../epicmorg/python/main/3.8/etc/apt/sources.list | 10 ++-------- .../main/3.8/etc/apt/sources.list.d/github-cli.list | 1 - linux/ecosystem/epicmorg/python/main/3.9/Dockerfile | 7 ++++--- .../epicmorg/python/main/3.9/etc/apt/sources.list | 10 ++-------- .../main/3.9/etc/apt/sources.list.d/github-cli.list | 1 - 22 files changed, 44 insertions(+), 84 deletions(-) delete mode 100644 linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list.d/github-cli.list delete mode 100644 linux/ecosystem/epicmorg/python/main/3.10/etc/apt/sources.list.d/github-cli.list delete mode 100644 linux/ecosystem/epicmorg/python/main/3.11/etc/apt/sources.list.d/github-cli.list delete mode 100644 linux/ecosystem/epicmorg/python/main/3.6/etc/apt/sources.list.d/github-cli.list delete mode 100644 linux/ecosystem/epicmorg/python/main/3.7/etc/apt/sources.list.d/github-cli.list delete mode 100644 linux/ecosystem/epicmorg/python/main/3.8/etc/apt/sources.list.d/github-cli.list delete mode 100644 linux/ecosystem/epicmorg/python/main/3.9/etc/apt/sources.list.d/github-cli.list diff --git a/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile index 276f36f5b..1171b0e26 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile @@ -114,7 +114,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio subversion-tools \ pev - ################################################################## # installing fs-tools ################################################################## diff --git a/linux/ecosystem/epicmorg/python/main/2.7/Dockerfile b/linux/ecosystem/epicmorg/python/main/2.7/Dockerfile index bbd475424..5eef4eff7 100644 --- a/linux/ecosystem/epicmorg/python/main/2.7/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/2.7/Dockerfile @@ -205,9 +205,10 @@ 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 && \ +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 diff --git a/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list b/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list index ef1ba0092..4e9c6134d 100644 --- a/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list +++ b/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list @@ -15,11 +15,8 @@ deb http://httpredir.debian.org/debian/ buster-proposed-updates main contrib non deb-src http://httpredir.debian.org/debian/ buster-proposed-updates main contrib non-free #security -deb http://httpredir.debian.org/debian-security/ buster/updates main contrib non-free -deb-src http://httpredir.debian.org/debian-security/ buster/updates main contrib non-free +deb http://security.debian.org/debian/ buster/updates main contrib non-free +deb-src http://security.debian.org/debian/ buster/updates main contrib non-free -##multimedia -#deb http://httpredir.debian.org/debian-multimedia/ buster main non-free -#deb-src http://httpredir.debian.org/debian-multimedia/ buster main non-free -#deb http://httpredir.debian.org/debian-multimedia/ buster-backports main -#deb-src http://httpredir.debian.org/debian-multimedia/ buster-backports main +deb http://httpredir.debian.org/debian/ buster/updates main contrib non-free +deb-src http://httpredir.debian.org/debian/ buster/updates main contrib non-free diff --git a/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list.d/github-cli.list b/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list.d/github-cli.list deleted file mode 100644 index 4442663ff..000000000 --- a/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list.d/github-cli.list +++ /dev/null @@ -1 +0,0 @@ -deb https://cli.github.com/packages stable main diff --git a/linux/ecosystem/epicmorg/python/main/3.10/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.10/Dockerfile index 7af2b4782..3e75d17d7 100644 --- a/linux/ecosystem/epicmorg/python/main/3.10/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.10/Dockerfile @@ -209,9 +209,10 @@ 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 && \ +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 diff --git a/linux/ecosystem/epicmorg/python/main/3.10/etc/apt/sources.list b/linux/ecosystem/epicmorg/python/main/3.10/etc/apt/sources.list index 508f1b71c..517c8fc52 100644 --- a/linux/ecosystem/epicmorg/python/main/3.10/etc/apt/sources.list +++ b/linux/ecosystem/epicmorg/python/main/3.10/etc/apt/sources.list @@ -15,14 +15,8 @@ deb http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib n deb-src http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free #security -deb http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free -deb-src http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free +deb http://security.debian.org/debian-security/ bullseye-security/updates main contrib non-free +deb-src http://security.debian.org/debian-security/ bullseye-security/updates main contrib non-free deb http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free deb-src http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free - -##multimedia -#deb http://httpredir.debian.org/debian-multimedia/ bullseye main non-free -#deb-src http://httpredir.debian.org/debian-multimedia/ bullseye main non-free -#deb http://httpredir.debian.org/debian-multimedia/ bullseye-backports main -#deb-src http://httpredir.debian.org/debian-multimedia/ bullseye-backports main diff --git a/linux/ecosystem/epicmorg/python/main/3.10/etc/apt/sources.list.d/github-cli.list b/linux/ecosystem/epicmorg/python/main/3.10/etc/apt/sources.list.d/github-cli.list deleted file mode 100644 index 4442663ff..000000000 --- a/linux/ecosystem/epicmorg/python/main/3.10/etc/apt/sources.list.d/github-cli.list +++ /dev/null @@ -1 +0,0 @@ -deb https://cli.github.com/packages stable main diff --git a/linux/ecosystem/epicmorg/python/main/3.11/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.11/Dockerfile index c15103645..dab408cd1 100644 --- a/linux/ecosystem/epicmorg/python/main/3.11/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.11/Dockerfile @@ -200,9 +200,10 @@ 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 && \ +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 diff --git a/linux/ecosystem/epicmorg/python/main/3.11/etc/apt/sources.list b/linux/ecosystem/epicmorg/python/main/3.11/etc/apt/sources.list index 508f1b71c..517c8fc52 100644 --- a/linux/ecosystem/epicmorg/python/main/3.11/etc/apt/sources.list +++ b/linux/ecosystem/epicmorg/python/main/3.11/etc/apt/sources.list @@ -15,14 +15,8 @@ deb http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib n deb-src http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free #security -deb http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free -deb-src http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free +deb http://security.debian.org/debian-security/ bullseye-security/updates main contrib non-free +deb-src http://security.debian.org/debian-security/ bullseye-security/updates main contrib non-free deb http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free deb-src http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free - -##multimedia -#deb http://httpredir.debian.org/debian-multimedia/ bullseye main non-free -#deb-src http://httpredir.debian.org/debian-multimedia/ bullseye main non-free -#deb http://httpredir.debian.org/debian-multimedia/ bullseye-backports main -#deb-src http://httpredir.debian.org/debian-multimedia/ bullseye-backports main diff --git a/linux/ecosystem/epicmorg/python/main/3.11/etc/apt/sources.list.d/github-cli.list b/linux/ecosystem/epicmorg/python/main/3.11/etc/apt/sources.list.d/github-cli.list deleted file mode 100644 index 4442663ff..000000000 --- a/linux/ecosystem/epicmorg/python/main/3.11/etc/apt/sources.list.d/github-cli.list +++ /dev/null @@ -1 +0,0 @@ -deb https://cli.github.com/packages stable main diff --git a/linux/ecosystem/epicmorg/python/main/3.6/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.6/Dockerfile index 16fcf0e3b..633b7d2a5 100644 --- a/linux/ecosystem/epicmorg/python/main/3.6/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.6/Dockerfile @@ -200,9 +200,10 @@ 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 && \ +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 diff --git a/linux/ecosystem/epicmorg/python/main/3.6/etc/apt/sources.list b/linux/ecosystem/epicmorg/python/main/3.6/etc/apt/sources.list index 508f1b71c..517c8fc52 100644 --- a/linux/ecosystem/epicmorg/python/main/3.6/etc/apt/sources.list +++ b/linux/ecosystem/epicmorg/python/main/3.6/etc/apt/sources.list @@ -15,14 +15,8 @@ deb http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib n deb-src http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free #security -deb http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free -deb-src http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free +deb http://security.debian.org/debian-security/ bullseye-security/updates main contrib non-free +deb-src http://security.debian.org/debian-security/ bullseye-security/updates main contrib non-free deb http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free deb-src http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free - -##multimedia -#deb http://httpredir.debian.org/debian-multimedia/ bullseye main non-free -#deb-src http://httpredir.debian.org/debian-multimedia/ bullseye main non-free -#deb http://httpredir.debian.org/debian-multimedia/ bullseye-backports main -#deb-src http://httpredir.debian.org/debian-multimedia/ bullseye-backports main diff --git a/linux/ecosystem/epicmorg/python/main/3.6/etc/apt/sources.list.d/github-cli.list b/linux/ecosystem/epicmorg/python/main/3.6/etc/apt/sources.list.d/github-cli.list deleted file mode 100644 index 4442663ff..000000000 --- a/linux/ecosystem/epicmorg/python/main/3.6/etc/apt/sources.list.d/github-cli.list +++ /dev/null @@ -1 +0,0 @@ -deb https://cli.github.com/packages stable main diff --git a/linux/ecosystem/epicmorg/python/main/3.7/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.7/Dockerfile index 0bbe718f7..3351e17da 100644 --- a/linux/ecosystem/epicmorg/python/main/3.7/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.7/Dockerfile @@ -200,9 +200,10 @@ 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 && \ +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 diff --git a/linux/ecosystem/epicmorg/python/main/3.7/etc/apt/sources.list b/linux/ecosystem/epicmorg/python/main/3.7/etc/apt/sources.list index 508f1b71c..517c8fc52 100644 --- a/linux/ecosystem/epicmorg/python/main/3.7/etc/apt/sources.list +++ b/linux/ecosystem/epicmorg/python/main/3.7/etc/apt/sources.list @@ -15,14 +15,8 @@ deb http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib n deb-src http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free #security -deb http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free -deb-src http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free +deb http://security.debian.org/debian-security/ bullseye-security/updates main contrib non-free +deb-src http://security.debian.org/debian-security/ bullseye-security/updates main contrib non-free deb http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free deb-src http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free - -##multimedia -#deb http://httpredir.debian.org/debian-multimedia/ bullseye main non-free -#deb-src http://httpredir.debian.org/debian-multimedia/ bullseye main non-free -#deb http://httpredir.debian.org/debian-multimedia/ bullseye-backports main -#deb-src http://httpredir.debian.org/debian-multimedia/ bullseye-backports main diff --git a/linux/ecosystem/epicmorg/python/main/3.7/etc/apt/sources.list.d/github-cli.list b/linux/ecosystem/epicmorg/python/main/3.7/etc/apt/sources.list.d/github-cli.list deleted file mode 100644 index 4442663ff..000000000 --- a/linux/ecosystem/epicmorg/python/main/3.7/etc/apt/sources.list.d/github-cli.list +++ /dev/null @@ -1 +0,0 @@ -deb https://cli.github.com/packages stable main diff --git a/linux/ecosystem/epicmorg/python/main/3.8/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.8/Dockerfile index 81bee341e..2c73e115d 100644 --- a/linux/ecosystem/epicmorg/python/main/3.8/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.8/Dockerfile @@ -200,9 +200,10 @@ 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 && \ +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 diff --git a/linux/ecosystem/epicmorg/python/main/3.8/etc/apt/sources.list b/linux/ecosystem/epicmorg/python/main/3.8/etc/apt/sources.list index 508f1b71c..517c8fc52 100644 --- a/linux/ecosystem/epicmorg/python/main/3.8/etc/apt/sources.list +++ b/linux/ecosystem/epicmorg/python/main/3.8/etc/apt/sources.list @@ -15,14 +15,8 @@ deb http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib n deb-src http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free #security -deb http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free -deb-src http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free +deb http://security.debian.org/debian-security/ bullseye-security/updates main contrib non-free +deb-src http://security.debian.org/debian-security/ bullseye-security/updates main contrib non-free deb http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free deb-src http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free - -##multimedia -#deb http://httpredir.debian.org/debian-multimedia/ bullseye main non-free -#deb-src http://httpredir.debian.org/debian-multimedia/ bullseye main non-free -#deb http://httpredir.debian.org/debian-multimedia/ bullseye-backports main -#deb-src http://httpredir.debian.org/debian-multimedia/ bullseye-backports main diff --git a/linux/ecosystem/epicmorg/python/main/3.8/etc/apt/sources.list.d/github-cli.list b/linux/ecosystem/epicmorg/python/main/3.8/etc/apt/sources.list.d/github-cli.list deleted file mode 100644 index 4442663ff..000000000 --- a/linux/ecosystem/epicmorg/python/main/3.8/etc/apt/sources.list.d/github-cli.list +++ /dev/null @@ -1 +0,0 @@ -deb https://cli.github.com/packages stable main diff --git a/linux/ecosystem/epicmorg/python/main/3.9/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.9/Dockerfile index 040e57441..6f1e2cda5 100644 --- a/linux/ecosystem/epicmorg/python/main/3.9/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.9/Dockerfile @@ -200,9 +200,10 @@ 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 && \ +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 diff --git a/linux/ecosystem/epicmorg/python/main/3.9/etc/apt/sources.list b/linux/ecosystem/epicmorg/python/main/3.9/etc/apt/sources.list index 508f1b71c..517c8fc52 100644 --- a/linux/ecosystem/epicmorg/python/main/3.9/etc/apt/sources.list +++ b/linux/ecosystem/epicmorg/python/main/3.9/etc/apt/sources.list @@ -15,14 +15,8 @@ deb http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib n deb-src http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free #security -deb http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free -deb-src http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free +deb http://security.debian.org/debian-security/ bullseye-security/updates main contrib non-free +deb-src http://security.debian.org/debian-security/ bullseye-security/updates main contrib non-free deb http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free deb-src http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free - -##multimedia -#deb http://httpredir.debian.org/debian-multimedia/ bullseye main non-free -#deb-src http://httpredir.debian.org/debian-multimedia/ bullseye main non-free -#deb http://httpredir.debian.org/debian-multimedia/ bullseye-backports main -#deb-src http://httpredir.debian.org/debian-multimedia/ bullseye-backports main diff --git a/linux/ecosystem/epicmorg/python/main/3.9/etc/apt/sources.list.d/github-cli.list b/linux/ecosystem/epicmorg/python/main/3.9/etc/apt/sources.list.d/github-cli.list deleted file mode 100644 index 4442663ff..000000000 --- a/linux/ecosystem/epicmorg/python/main/3.9/etc/apt/sources.list.d/github-cli.list +++ /dev/null @@ -1 +0,0 @@ -deb https://cli.github.com/packages stable main From 7b161cd6eb96a1d53fe356d63baf76a0b881a5f2 Mon Sep 17 00:00:00 2001 From: Zimovskii Anatolii Date: Fri, 9 Sep 2022 20:35:44 +0300 Subject: [PATCH 3/5] make - autocommit --- .../epicmorg/debian/10-buster/slim/etc/apt/sources.list | 8 ++++---- .../epicmorg/python/main/2.7/etc/apt/sources.list | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/linux/ecosystem/epicmorg/debian/10-buster/slim/etc/apt/sources.list b/linux/ecosystem/epicmorg/debian/10-buster/slim/etc/apt/sources.list index 4e9c6134d..42545bbef 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/slim/etc/apt/sources.list +++ b/linux/ecosystem/epicmorg/debian/10-buster/slim/etc/apt/sources.list @@ -15,8 +15,8 @@ deb http://httpredir.debian.org/debian/ buster-proposed-updates main contrib non deb-src http://httpredir.debian.org/debian/ buster-proposed-updates main contrib non-free #security -deb http://security.debian.org/debian/ buster/updates main contrib non-free -deb-src http://security.debian.org/debian/ buster/updates main contrib non-free +deb http://security.debian.org/debian-security/ buster/updates main contrib non-free +deb-src http://security.debian.org/debian-security/ buster/updates main contrib non-free -deb http://httpredir.debian.org/debian/ buster/updates main contrib non-free -deb-src http://httpredir.debian.org/debian/ buster/updates main contrib non-free +deb http://httpredir.debian.org/debian-security/ buster/updates main contrib non-free +deb-src http://httpredir.debian.org/debian-security/ buster/updates main contrib non-free diff --git a/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list b/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list index 4e9c6134d..42545bbef 100644 --- a/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list +++ b/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list @@ -15,8 +15,8 @@ deb http://httpredir.debian.org/debian/ buster-proposed-updates main contrib non deb-src http://httpredir.debian.org/debian/ buster-proposed-updates main contrib non-free #security -deb http://security.debian.org/debian/ buster/updates main contrib non-free -deb-src http://security.debian.org/debian/ buster/updates main contrib non-free +deb http://security.debian.org/debian-security/ buster/updates main contrib non-free +deb-src http://security.debian.org/debian-security/ buster/updates main contrib non-free -deb http://httpredir.debian.org/debian/ buster/updates main contrib non-free -deb-src http://httpredir.debian.org/debian/ buster/updates main contrib non-free +deb http://httpredir.debian.org/debian-security/ buster/updates main contrib non-free +deb-src http://httpredir.debian.org/debian-security/ buster/updates main contrib non-free From cdf9c5a7dbcbedf83b69e7ed7a8c1821b572aa1d Mon Sep 17 00:00:00 2001 From: STAM Date: Fri, 9 Sep 2022 21:28:10 +0300 Subject: [PATCH 4/5] p4 link fix --- linux/ecosystem/epicmorg/python/main/2.7/Dockerfile | 2 +- linux/ecosystem/epicmorg/python/main/3.10/Dockerfile | 2 +- linux/ecosystem/epicmorg/python/main/3.11/Dockerfile | 2 +- linux/ecosystem/epicmorg/python/main/3.6/Dockerfile | 2 +- linux/ecosystem/epicmorg/python/main/3.7/Dockerfile | 2 +- linux/ecosystem/epicmorg/python/main/3.8/Dockerfile | 2 +- linux/ecosystem/epicmorg/python/main/3.9/Dockerfile | 2 +- linux/ecosystem/nginx/1.14.2/php/Dockerfile | 4 ++-- linux/ecosystem/nginx/1.15.12/php/Dockerfile | 4 ++-- linux/ecosystem/nginx/1.16.1/php/Dockerfile | 4 ++-- linux/ecosystem/nginx/1.17.10/php/Dockerfile | 4 ++-- linux/ecosystem/nginx/1.18.0/php/Dockerfile | 4 ++-- linux/ecosystem/nginx/1.19.10/php/Dockerfile | 4 ++-- linux/ecosystem/nginx/1.20.1/php/Dockerfile | 4 ++-- linux/ecosystem/nginx/1.21.3/php/Dockerfile | 4 ++-- linux/ecosystem/nginx/latest/php/Dockerfile | 4 ++-- linux/ecosystem/perforce/base/r16.2/Dockerfile | 2 +- linux/ecosystem/perforce/base/r17.1/Dockerfile | 2 +- linux/ecosystem/perforce/base/r17.2/Dockerfile | 2 +- linux/ecosystem/perforce/base/r18.1/Dockerfile | 2 +- linux/ecosystem/perforce/base/r18.2/Dockerfile | 2 +- linux/ecosystem/perforce/base/r19.1/Dockerfile | 2 +- linux/ecosystem/perforce/base/r19.2/Dockerfile | 2 +- linux/ecosystem/perforce/base/r20.1/Dockerfile | 2 +- linux/ecosystem/perforce/base/r20.2/Dockerfile | 2 +- linux/ecosystem/perforce/base/r21.1/Dockerfile | 2 +- linux/ecosystem/perforce/base/r21.2/Dockerfile | 2 +- linux/ecosystem/perforce/base/r22.1/Dockerfile | 2 +- linux/ecosystem/php/latest/Dockerfile | 4 ++-- linux/ecosystem/php/php7.2/Dockerfile | 4 ++-- linux/ecosystem/php/php7.3/Dockerfile | 4 ++-- linux/ecosystem/php/php7.4/Dockerfile | 4 ++-- linux/ecosystem/php/php8.0/Dockerfile | 4 ++-- linux/ecosystem/php/php8.1-p4-not-ready/Dockerfile | 4 ++-- 34 files changed, 49 insertions(+), 49 deletions(-) diff --git a/linux/ecosystem/epicmorg/python/main/2.7/Dockerfile b/linux/ecosystem/epicmorg/python/main/2.7/Dockerfile index 5eef4eff7..a6a8faefd 100644 --- a/linux/ecosystem/epicmorg/python/main/2.7/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/2.7/Dockerfile @@ -57,7 +57,7 @@ RUN update-ca-certificates # perforce client binary ################################################################## ENV P4_VERSION=r22.1 -ENV P4_DOWNLOAD_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64/p4 +ENV P4_DOWNLOAD_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64/p4 ################################################################## # 7z official binary diff --git a/linux/ecosystem/epicmorg/python/main/3.10/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.10/Dockerfile index 3e75d17d7..500bdd415 100644 --- a/linux/ecosystem/epicmorg/python/main/3.10/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.10/Dockerfile @@ -60,7 +60,7 @@ RUN update-ca-certificates # perforce client binary ################################################################## ENV P4_VERSION=r22.1 -ENV P4_DOWNLOAD_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64/p4 +ENV P4_DOWNLOAD_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64/p4 ################################################################## # 7z official binary diff --git a/linux/ecosystem/epicmorg/python/main/3.11/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.11/Dockerfile index dab408cd1..89dd5c934 100644 --- a/linux/ecosystem/epicmorg/python/main/3.11/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.11/Dockerfile @@ -51,7 +51,7 @@ RUN update-ca-certificates # perforce client binary ################################################################## ENV P4_VERSION=r22.1 -ENV P4_DOWNLOAD_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64/p4 +ENV P4_DOWNLOAD_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64/p4 ################################################################## # 7z official binary diff --git a/linux/ecosystem/epicmorg/python/main/3.6/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.6/Dockerfile index 633b7d2a5..288cf57ef 100644 --- a/linux/ecosystem/epicmorg/python/main/3.6/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.6/Dockerfile @@ -51,7 +51,7 @@ RUN update-ca-certificates # perforce client binary ################################################################## ENV P4_VERSION=r22.1 -ENV P4_DOWNLOAD_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64/p4 +ENV P4_DOWNLOAD_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64/p4 ################################################################## # 7z official binary diff --git a/linux/ecosystem/epicmorg/python/main/3.7/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.7/Dockerfile index 3351e17da..8fbf9320d 100644 --- a/linux/ecosystem/epicmorg/python/main/3.7/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.7/Dockerfile @@ -51,7 +51,7 @@ RUN update-ca-certificates # perforce client binary ################################################################## ENV P4_VERSION=r22.1 -ENV P4_DOWNLOAD_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64/p4 +ENV P4_DOWNLOAD_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64/p4 ################################################################## # 7z official binary diff --git a/linux/ecosystem/epicmorg/python/main/3.8/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.8/Dockerfile index 2c73e115d..a8d7abb1b 100644 --- a/linux/ecosystem/epicmorg/python/main/3.8/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.8/Dockerfile @@ -51,7 +51,7 @@ RUN update-ca-certificates # perforce client binary ################################################################## ENV P4_VERSION=r22.1 -ENV P4_DOWNLOAD_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64/p4 +ENV P4_DOWNLOAD_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64/p4 ################################################################## # 7z official binary diff --git a/linux/ecosystem/epicmorg/python/main/3.9/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.9/Dockerfile index 6f1e2cda5..e615e241c 100644 --- a/linux/ecosystem/epicmorg/python/main/3.9/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.9/Dockerfile @@ -51,7 +51,7 @@ RUN update-ca-certificates # perforce client binary ################################################################## ENV P4_VERSION=r22.1 -ENV P4_DOWNLOAD_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64/p4 +ENV P4_DOWNLOAD_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64/p4 ################################################################## # 7z official binary diff --git a/linux/ecosystem/nginx/1.14.2/php/Dockerfile b/linux/ecosystem/nginx/1.14.2/php/Dockerfile index 3b2664f17..c0f6308c2 100644 --- a/linux/ecosystem/nginx/1.14.2/php/Dockerfile +++ b/linux/ecosystem/nginx/1.14.2/php/Dockerfile @@ -23,10 +23,10 @@ ARG P4PHP_DIR=${SRC_DIR}/p4php ARG MAKE_DIR=${SRC_DIR}/p4php-7.4 ARG P4API_VER=r20.1 -ARG P4API_URL=https://www.perforce.com/downloads/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz ARG P4PHP_VER=r20.1 -ARG P4PHP_URL=https://www.perforce.com/downloads/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz ARG PHP_MODULE_PATH=/usr/lib/php/20190902 diff --git a/linux/ecosystem/nginx/1.15.12/php/Dockerfile b/linux/ecosystem/nginx/1.15.12/php/Dockerfile index 3b2664f17..c0f6308c2 100644 --- a/linux/ecosystem/nginx/1.15.12/php/Dockerfile +++ b/linux/ecosystem/nginx/1.15.12/php/Dockerfile @@ -23,10 +23,10 @@ ARG P4PHP_DIR=${SRC_DIR}/p4php ARG MAKE_DIR=${SRC_DIR}/p4php-7.4 ARG P4API_VER=r20.1 -ARG P4API_URL=https://www.perforce.com/downloads/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz ARG P4PHP_VER=r20.1 -ARG P4PHP_URL=https://www.perforce.com/downloads/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz ARG PHP_MODULE_PATH=/usr/lib/php/20190902 diff --git a/linux/ecosystem/nginx/1.16.1/php/Dockerfile b/linux/ecosystem/nginx/1.16.1/php/Dockerfile index 3b2664f17..c0f6308c2 100644 --- a/linux/ecosystem/nginx/1.16.1/php/Dockerfile +++ b/linux/ecosystem/nginx/1.16.1/php/Dockerfile @@ -23,10 +23,10 @@ ARG P4PHP_DIR=${SRC_DIR}/p4php ARG MAKE_DIR=${SRC_DIR}/p4php-7.4 ARG P4API_VER=r20.1 -ARG P4API_URL=https://www.perforce.com/downloads/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz ARG P4PHP_VER=r20.1 -ARG P4PHP_URL=https://www.perforce.com/downloads/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz ARG PHP_MODULE_PATH=/usr/lib/php/20190902 diff --git a/linux/ecosystem/nginx/1.17.10/php/Dockerfile b/linux/ecosystem/nginx/1.17.10/php/Dockerfile index 3b2664f17..c0f6308c2 100644 --- a/linux/ecosystem/nginx/1.17.10/php/Dockerfile +++ b/linux/ecosystem/nginx/1.17.10/php/Dockerfile @@ -23,10 +23,10 @@ ARG P4PHP_DIR=${SRC_DIR}/p4php ARG MAKE_DIR=${SRC_DIR}/p4php-7.4 ARG P4API_VER=r20.1 -ARG P4API_URL=https://www.perforce.com/downloads/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz ARG P4PHP_VER=r20.1 -ARG P4PHP_URL=https://www.perforce.com/downloads/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz ARG PHP_MODULE_PATH=/usr/lib/php/20190902 diff --git a/linux/ecosystem/nginx/1.18.0/php/Dockerfile b/linux/ecosystem/nginx/1.18.0/php/Dockerfile index 3b2664f17..c0f6308c2 100644 --- a/linux/ecosystem/nginx/1.18.0/php/Dockerfile +++ b/linux/ecosystem/nginx/1.18.0/php/Dockerfile @@ -23,10 +23,10 @@ ARG P4PHP_DIR=${SRC_DIR}/p4php ARG MAKE_DIR=${SRC_DIR}/p4php-7.4 ARG P4API_VER=r20.1 -ARG P4API_URL=https://www.perforce.com/downloads/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz ARG P4PHP_VER=r20.1 -ARG P4PHP_URL=https://www.perforce.com/downloads/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz ARG PHP_MODULE_PATH=/usr/lib/php/20190902 diff --git a/linux/ecosystem/nginx/1.19.10/php/Dockerfile b/linux/ecosystem/nginx/1.19.10/php/Dockerfile index 3b2664f17..c0f6308c2 100644 --- a/linux/ecosystem/nginx/1.19.10/php/Dockerfile +++ b/linux/ecosystem/nginx/1.19.10/php/Dockerfile @@ -23,10 +23,10 @@ ARG P4PHP_DIR=${SRC_DIR}/p4php ARG MAKE_DIR=${SRC_DIR}/p4php-7.4 ARG P4API_VER=r20.1 -ARG P4API_URL=https://www.perforce.com/downloads/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz ARG P4PHP_VER=r20.1 -ARG P4PHP_URL=https://www.perforce.com/downloads/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz ARG PHP_MODULE_PATH=/usr/lib/php/20190902 diff --git a/linux/ecosystem/nginx/1.20.1/php/Dockerfile b/linux/ecosystem/nginx/1.20.1/php/Dockerfile index 3b2664f17..c0f6308c2 100644 --- a/linux/ecosystem/nginx/1.20.1/php/Dockerfile +++ b/linux/ecosystem/nginx/1.20.1/php/Dockerfile @@ -23,10 +23,10 @@ ARG P4PHP_DIR=${SRC_DIR}/p4php ARG MAKE_DIR=${SRC_DIR}/p4php-7.4 ARG P4API_VER=r20.1 -ARG P4API_URL=https://www.perforce.com/downloads/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz ARG P4PHP_VER=r20.1 -ARG P4PHP_URL=https://www.perforce.com/downloads/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz ARG PHP_MODULE_PATH=/usr/lib/php/20190902 diff --git a/linux/ecosystem/nginx/1.21.3/php/Dockerfile b/linux/ecosystem/nginx/1.21.3/php/Dockerfile index 3b2664f17..c0f6308c2 100644 --- a/linux/ecosystem/nginx/1.21.3/php/Dockerfile +++ b/linux/ecosystem/nginx/1.21.3/php/Dockerfile @@ -23,10 +23,10 @@ ARG P4PHP_DIR=${SRC_DIR}/p4php ARG MAKE_DIR=${SRC_DIR}/p4php-7.4 ARG P4API_VER=r20.1 -ARG P4API_URL=https://www.perforce.com/downloads/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz ARG P4PHP_VER=r20.1 -ARG P4PHP_URL=https://www.perforce.com/downloads/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz ARG PHP_MODULE_PATH=/usr/lib/php/20190902 diff --git a/linux/ecosystem/nginx/latest/php/Dockerfile b/linux/ecosystem/nginx/latest/php/Dockerfile index df6c10846..319aa550c 100644 --- a/linux/ecosystem/nginx/latest/php/Dockerfile +++ b/linux/ecosystem/nginx/latest/php/Dockerfile @@ -23,10 +23,10 @@ ARG P4PHP_DIR=${SRC_DIR}/p4php ARG MAKE_DIR=${SRC_DIR}/p4php-7.4 ARG P4API_VER=r20.1 -ARG P4API_URL=https://www.perforce.com/downloads/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz ARG P4PHP_VER=r20.1 -ARG P4PHP_URL=https://www.perforce.com/downloads/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz ARG PHP_MODULE_PATH=/usr/lib/php/20190902 diff --git a/linux/ecosystem/perforce/base/r16.2/Dockerfile b/linux/ecosystem/perforce/base/r16.2/Dockerfile index 33dd12c87..8994e1cbf 100644 --- a/linux/ecosystem/perforce/base/r16.2/Dockerfile +++ b/linux/ecosystem/perforce/base/r16.2/Dockerfile @@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive # perforce default envs ################################################################## ENV P4_VERSION=r16.2 -ENV P4_CDN_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64 +ENV P4_CDN_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64 ENV P4_DOWNLOAD_URL=${P4_CDN_URL}/p4 ENV P4BROKER_DOWNLOAD_URL=${P4_CDN_URL}/p4broker ENV P4D_DOWNLOAD_URL=${P4_CDN_URL}/p4d diff --git a/linux/ecosystem/perforce/base/r17.1/Dockerfile b/linux/ecosystem/perforce/base/r17.1/Dockerfile index 80643aeb8..e9d87a870 100644 --- a/linux/ecosystem/perforce/base/r17.1/Dockerfile +++ b/linux/ecosystem/perforce/base/r17.1/Dockerfile @@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive # perforce default envs ################################################################## ENV P4_VERSION=r17.1 -ENV P4_CDN_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64 +ENV P4_CDN_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64 ENV P4_DOWNLOAD_URL=${P4_CDN_URL}/p4 ENV P4BROKER_DOWNLOAD_URL=${P4_CDN_URL}/p4broker ENV P4D_DOWNLOAD_URL=${P4_CDN_URL}/p4d diff --git a/linux/ecosystem/perforce/base/r17.2/Dockerfile b/linux/ecosystem/perforce/base/r17.2/Dockerfile index e10e8e8e8..c30da8165 100644 --- a/linux/ecosystem/perforce/base/r17.2/Dockerfile +++ b/linux/ecosystem/perforce/base/r17.2/Dockerfile @@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive # perforce default envs ################################################################## ENV P4_VERSION=r17.2 -ENV P4_CDN_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64 +ENV P4_CDN_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64 ENV P4_DOWNLOAD_URL=${P4_CDN_URL}/p4 ENV P4BROKER_DOWNLOAD_URL=${P4_CDN_URL}/p4broker ENV P4D_DOWNLOAD_URL=${P4_CDN_URL}/p4d diff --git a/linux/ecosystem/perforce/base/r18.1/Dockerfile b/linux/ecosystem/perforce/base/r18.1/Dockerfile index ecf4629a3..d9f4643f8 100644 --- a/linux/ecosystem/perforce/base/r18.1/Dockerfile +++ b/linux/ecosystem/perforce/base/r18.1/Dockerfile @@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive # perforce default envs ################################################################## ENV P4_VERSION=r18.1 -ENV P4_CDN_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64 +ENV P4_CDN_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64 ENV P4_DOWNLOAD_URL=${P4_CDN_URL}/p4 ENV P4BROKER_DOWNLOAD_URL=${P4_CDN_URL}/p4broker ENV P4D_DOWNLOAD_URL=${P4_CDN_URL}/p4d diff --git a/linux/ecosystem/perforce/base/r18.2/Dockerfile b/linux/ecosystem/perforce/base/r18.2/Dockerfile index 1e480706b..ce7f36395 100644 --- a/linux/ecosystem/perforce/base/r18.2/Dockerfile +++ b/linux/ecosystem/perforce/base/r18.2/Dockerfile @@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive # perforce default envs ################################################################## ENV P4_VERSION=r18.2 -ENV P4_CDN_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64 +ENV P4_CDN_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64 ENV P4_DOWNLOAD_URL=${P4_CDN_URL}/p4 ENV P4BROKER_DOWNLOAD_URL=${P4_CDN_URL}/p4broker ENV P4D_DOWNLOAD_URL=${P4_CDN_URL}/p4d diff --git a/linux/ecosystem/perforce/base/r19.1/Dockerfile b/linux/ecosystem/perforce/base/r19.1/Dockerfile index affc4de20..50cac64ea 100644 --- a/linux/ecosystem/perforce/base/r19.1/Dockerfile +++ b/linux/ecosystem/perforce/base/r19.1/Dockerfile @@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive # perforce default envs ################################################################## ENV P4_VERSION=r19.1 -ENV P4_CDN_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64 +ENV P4_CDN_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64 ENV P4_DOWNLOAD_URL=${P4_CDN_URL}/p4 ENV P4BROKER_DOWNLOAD_URL=${P4_CDN_URL}/p4broker ENV P4D_DOWNLOAD_URL=${P4_CDN_URL}/p4d diff --git a/linux/ecosystem/perforce/base/r19.2/Dockerfile b/linux/ecosystem/perforce/base/r19.2/Dockerfile index 4797154b0..5d1397eeb 100644 --- a/linux/ecosystem/perforce/base/r19.2/Dockerfile +++ b/linux/ecosystem/perforce/base/r19.2/Dockerfile @@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive # perforce default envs ################################################################## ENV P4_VERSION=r19.2 -ENV P4_CDN_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64 +ENV P4_CDN_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64 ENV P4_DOWNLOAD_URL=${P4_CDN_URL}/p4 ENV P4BROKER_DOWNLOAD_URL=${P4_CDN_URL}/p4broker ENV P4D_DOWNLOAD_URL=${P4_CDN_URL}/p4d diff --git a/linux/ecosystem/perforce/base/r20.1/Dockerfile b/linux/ecosystem/perforce/base/r20.1/Dockerfile index 3d043bc25..ab7b82420 100644 --- a/linux/ecosystem/perforce/base/r20.1/Dockerfile +++ b/linux/ecosystem/perforce/base/r20.1/Dockerfile @@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive # perforce default envs ################################################################## ENV P4_VERSION=r20.1 -ENV P4_CDN_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64 +ENV P4_CDN_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64 ENV P4_DOWNLOAD_URL=${P4_CDN_URL}/p4 ENV P4BROKER_DOWNLOAD_URL=${P4_CDN_URL}/p4broker ENV P4D_DOWNLOAD_URL=${P4_CDN_URL}/p4d diff --git a/linux/ecosystem/perforce/base/r20.2/Dockerfile b/linux/ecosystem/perforce/base/r20.2/Dockerfile index 7f5d26d48..913fc0c9f 100644 --- a/linux/ecosystem/perforce/base/r20.2/Dockerfile +++ b/linux/ecosystem/perforce/base/r20.2/Dockerfile @@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive # perforce default envs ################################################################## ENV P4_VERSION=r20.2 -ENV P4_CDN_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64 +ENV P4_CDN_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64 ENV P4_DOWNLOAD_URL=${P4_CDN_URL}/p4 ENV P4BROKER_DOWNLOAD_URL=${P4_CDN_URL}/p4broker ENV P4D_DOWNLOAD_URL=${P4_CDN_URL}/p4d diff --git a/linux/ecosystem/perforce/base/r21.1/Dockerfile b/linux/ecosystem/perforce/base/r21.1/Dockerfile index 5291c4907..1c916c5b9 100644 --- a/linux/ecosystem/perforce/base/r21.1/Dockerfile +++ b/linux/ecosystem/perforce/base/r21.1/Dockerfile @@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive # perforce default envs ################################################################## ENV P4_VERSION=r21.1 -ENV P4_CDN_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64 +ENV P4_CDN_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64 ENV P4_DOWNLOAD_URL=${P4_CDN_URL}/p4 ENV P4BROKER_DOWNLOAD_URL=${P4_CDN_URL}/p4broker ENV P4D_DOWNLOAD_URL=${P4_CDN_URL}/p4d diff --git a/linux/ecosystem/perforce/base/r21.2/Dockerfile b/linux/ecosystem/perforce/base/r21.2/Dockerfile index ebbf7dbb3..a06ae1954 100644 --- a/linux/ecosystem/perforce/base/r21.2/Dockerfile +++ b/linux/ecosystem/perforce/base/r21.2/Dockerfile @@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive # perforce default envs ################################################################## ENV P4_VERSION=r21.2 -ENV P4_CDN_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64 +ENV P4_CDN_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64 ENV P4_DOWNLOAD_URL=${P4_CDN_URL}/p4 ENV P4BROKER_DOWNLOAD_URL=${P4_CDN_URL}/p4broker ENV P4D_DOWNLOAD_URL=${P4_CDN_URL}/p4d diff --git a/linux/ecosystem/perforce/base/r22.1/Dockerfile b/linux/ecosystem/perforce/base/r22.1/Dockerfile index 32ab13129..5bb2748ee 100644 --- a/linux/ecosystem/perforce/base/r22.1/Dockerfile +++ b/linux/ecosystem/perforce/base/r22.1/Dockerfile @@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive # perforce default envs ################################################################## ENV P4_VERSION=r22.1 -ENV P4_CDN_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64 +ENV P4_CDN_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64 ENV P4_DOWNLOAD_URL=${P4_CDN_URL}/p4 ENV P4BROKER_DOWNLOAD_URL=${P4_CDN_URL}/p4broker ENV P4D_DOWNLOAD_URL=${P4_CDN_URL}/p4d diff --git a/linux/ecosystem/php/latest/Dockerfile b/linux/ecosystem/php/latest/Dockerfile index 08a6919f9..d0784bb57 100644 --- a/linux/ecosystem/php/latest/Dockerfile +++ b/linux/ecosystem/php/latest/Dockerfile @@ -15,10 +15,10 @@ ARG P4PHP_DIR=${SRC_DIR}/p4php ARG MAKE_DIR=${SRC_DIR}/p4php-7.4 ARG P4API_VER=r20.1 -ARG P4API_URL=https://www.perforce.com/downloads/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz ARG P4PHP_VER=r20.1 -ARG P4PHP_URL=https://www.perforce.com/downloads/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz ARG PHP_MODULE_PATH=/usr/lib/php/20190902 diff --git a/linux/ecosystem/php/php7.2/Dockerfile b/linux/ecosystem/php/php7.2/Dockerfile index aba6eb87d..b3b527444 100644 --- a/linux/ecosystem/php/php7.2/Dockerfile +++ b/linux/ecosystem/php/php7.2/Dockerfile @@ -15,10 +15,10 @@ ARG P4PHP_DIR=${SRC_DIR}/p4php ARG MAKE_DIR=${SRC_DIR}/p4php-7.2 ARG P4API_VER=r20.1 -ARG P4API_URL=https://www.perforce.com/downloads/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz ARG P4PHP_VER=r20.1 -ARG P4PHP_URL=https://www.perforce.com/downloads/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz ARG P4MODULE_PATH=/usr/lib/php/20170718 diff --git a/linux/ecosystem/php/php7.3/Dockerfile b/linux/ecosystem/php/php7.3/Dockerfile index ff42b5c4d..1a0157990 100644 --- a/linux/ecosystem/php/php7.3/Dockerfile +++ b/linux/ecosystem/php/php7.3/Dockerfile @@ -15,10 +15,10 @@ ARG P4PHP_DIR=${SRC_DIR}/p4php ARG MAKE_DIR=${SRC_DIR}/p4php-7.3 ARG P4API_VER=r20.1 -ARG P4API_URL=https://www.perforce.com/downloads/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz ARG P4PHP_VER=r20.1 -ARG P4PHP_URL=https://www.perforce.com/downloads/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz ARG P4MODULE_PATH=/usr/lib/php/20180731 diff --git a/linux/ecosystem/php/php7.4/Dockerfile b/linux/ecosystem/php/php7.4/Dockerfile index 08a6919f9..d0784bb57 100644 --- a/linux/ecosystem/php/php7.4/Dockerfile +++ b/linux/ecosystem/php/php7.4/Dockerfile @@ -15,10 +15,10 @@ ARG P4PHP_DIR=${SRC_DIR}/p4php ARG MAKE_DIR=${SRC_DIR}/p4php-7.4 ARG P4API_VER=r20.1 -ARG P4API_URL=https://www.perforce.com/downloads/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz ARG P4PHP_VER=r20.1 -ARG P4PHP_URL=https://www.perforce.com/downloads/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz ARG PHP_MODULE_PATH=/usr/lib/php/20190902 diff --git a/linux/ecosystem/php/php8.0/Dockerfile b/linux/ecosystem/php/php8.0/Dockerfile index 86d03151f..8c22d9e47 100644 --- a/linux/ecosystem/php/php8.0/Dockerfile +++ b/linux/ecosystem/php/php8.0/Dockerfile @@ -15,10 +15,10 @@ ARG P4PHP_DIR=${SRC_DIR}/p4php ARG MAKE_DIR=${SRC_DIR}/p4php-${PHP_VER} ARG P4API_VER=r21.1 -ARG P4API_URL=https://www.perforce.com/downloads/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz ARG P4PHP_VER=r20.2 -ARG P4PHP_URL=https://www.perforce.com/downloads/perforce/${P4PHP_VER}/bin.tools/p4php.tgz +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php.tgz ARG PHP_VER=8.0 ARG PHP_MODULE_VER=20200930 diff --git a/linux/ecosystem/php/php8.1-p4-not-ready/Dockerfile b/linux/ecosystem/php/php8.1-p4-not-ready/Dockerfile index a15c60d9b..ad3e89dbd 100644 --- a/linux/ecosystem/php/php8.1-p4-not-ready/Dockerfile +++ b/linux/ecosystem/php/php8.1-p4-not-ready/Dockerfile @@ -16,10 +16,10 @@ ARG P4PHP_DIR=${SRC_DIR}/p4php ARG PHP_VER=8.1 ARG MAKE_DIR=${SRC_DIR}/p4php-${PHP_VER} ARG P4API_VER=r21.1 -ARG P4API_URL=https://www.perforce.com/downloads/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz +ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz ARG P4PHP_VER=r20.2 -ARG P4PHP_URL=https://www.perforce.com/downloads/perforce/${P4PHP_VER}/bin.tools/p4php.tgz +ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php.tgz ARG PHP_MODULE_VER=20210902 ARG PHP_MODULE_PATH=/usr/lib/php/${PHP_MODULE_VER} From dff8ccbc5422a60e605ed20bacada551551f55cd Mon Sep 17 00:00:00 2001 From: STAM Date: Sat, 10 Sep 2022 22:12:51 +0300 Subject: [PATCH 5/5] github actions fixes --- ...velop.yml => docker-linux-develop.yml.txt} | 0 ...master.yml => docker-linux-master.yml.txt} | 0 ...velop.yml => docker-win32-develop.yml.txt} | 0 ...master.yml => docker-win32-master.yml.txt} | 0 .../workflows/epicmorg.advanced.images.yml | 7 ++++++- .../epicmorg.advanced.nextcloud.images.yml | 6 +++--- .../epicmorg.advanced.vscode.images.yml | 6 +++--- .../epicmorg.advanced.zabbix.images.yml | 20 +++++++++---------- .github/workflows/epicmorg.base.images.yml | 9 +++++++-- .github/workflows/torrserver-temp.yml | 5 +++++ 10 files changed, 34 insertions(+), 19 deletions(-) rename .github/workflows/_disabled/{docker-linux-develop.yml => docker-linux-develop.yml.txt} (100%) rename .github/workflows/_disabled/{docker-linux-master.yml => docker-linux-master.yml.txt} (100%) rename .github/workflows/_disabled/{docker-win32-develop.yml => docker-win32-develop.yml.txt} (100%) rename .github/workflows/_disabled/{docker-win32-master.yml => docker-win32-master.yml.txt} (100%) diff --git a/.github/workflows/_disabled/docker-linux-develop.yml b/.github/workflows/_disabled/docker-linux-develop.yml.txt similarity index 100% rename from .github/workflows/_disabled/docker-linux-develop.yml rename to .github/workflows/_disabled/docker-linux-develop.yml.txt diff --git a/.github/workflows/_disabled/docker-linux-master.yml b/.github/workflows/_disabled/docker-linux-master.yml.txt similarity index 100% rename from .github/workflows/_disabled/docker-linux-master.yml rename to .github/workflows/_disabled/docker-linux-master.yml.txt diff --git a/.github/workflows/_disabled/docker-win32-develop.yml b/.github/workflows/_disabled/docker-win32-develop.yml.txt similarity index 100% rename from .github/workflows/_disabled/docker-win32-develop.yml rename to .github/workflows/_disabled/docker-win32-develop.yml.txt diff --git a/.github/workflows/_disabled/docker-win32-master.yml b/.github/workflows/_disabled/docker-win32-master.yml.txt similarity index 100% rename from .github/workflows/_disabled/docker-win32-master.yml rename to .github/workflows/_disabled/docker-win32-master.yml.txt diff --git a/.github/workflows/epicmorg.advanced.images.yml b/.github/workflows/epicmorg.advanced.images.yml index 567b4aeed..1aafeaab2 100644 --- a/.github/workflows/epicmorg.advanced.images.yml +++ b/.github/workflows/epicmorg.advanced.images.yml @@ -1,4 +1,4 @@ -name: epicmorg.advanced.images +name: EpicMorg Advanced Images on: # push: @@ -34,3 +34,8 @@ jobs: - name: "Build and Deploy Advanced Redash Images:" run: cd linux/advanced/redash && pwd && make sync && make patch && make build && make deploy + +################################################################################## + + - name: Cleanup + run: make docker-clean diff --git a/.github/workflows/epicmorg.advanced.nextcloud.images.yml b/.github/workflows/epicmorg.advanced.nextcloud.images.yml index 110f980a4..fe4a943d3 100644 --- a/.github/workflows/epicmorg.advanced.nextcloud.images.yml +++ b/.github/workflows/epicmorg.advanced.nextcloud.images.yml @@ -1,4 +1,4 @@ -name: epicmorg.advanced.nextcloud +name: EpicMorg Advanced Nextcloud Images on: # push: @@ -10,7 +10,7 @@ on: jobs: build-pure-images: - name: Advanced Nextcloud Stock Images + name: EpicMorg Advanced Nextcloud Stock Images runs-on: ubuntu-22.04 steps: @@ -116,4 +116,4 @@ jobs: ################################################################################## - name: Cleanup - run: make clean + run: make docker-clean diff --git a/.github/workflows/epicmorg.advanced.vscode.images.yml b/.github/workflows/epicmorg.advanced.vscode.images.yml index ea9af5b44..91408e34f 100644 --- a/.github/workflows/epicmorg.advanced.vscode.images.yml +++ b/.github/workflows/epicmorg.advanced.vscode.images.yml @@ -1,4 +1,4 @@ -name: epicmorg.advanced.vscode.images +name: "EpicMorg Advanced Vscode Server Images" on: # push: @@ -10,7 +10,7 @@ on: jobs: build-images: - name: Build EpicMorg Advanced Images + name: Build EpicMorg Advanced Vscode Server Images runs-on: ubuntu-22.04 steps: @@ -56,5 +56,5 @@ jobs: ################################################################################## - name: Cleanup - run: make clean + run: make docker-clean diff --git a/.github/workflows/epicmorg.advanced.zabbix.images.yml b/.github/workflows/epicmorg.advanced.zabbix.images.yml index f55e49ea0..36c3cc87b 100644 --- a/.github/workflows/epicmorg.advanced.zabbix.images.yml +++ b/.github/workflows/epicmorg.advanced.zabbix.images.yml @@ -1,4 +1,4 @@ -name: epicmorg.advanced.nextcloud +name: EpicMorg Advanced Zabbix Images on: # push: @@ -10,7 +10,7 @@ on: jobs: build-latest-images: - name: Build EpicMorg Advanced Zabbix Images + name: EpicMorg Advanced Zabbix Latest Images runs-on: ubuntu-22.04 steps: @@ -57,7 +57,7 @@ jobs: ################################################################################## build-30-images: - name: Build EpicMorg Advanced Zabbix Images + name: Build EpicMorg Advanced Zabbix 3.0 Images runs-on: ubuntu-22.04 steps: @@ -101,7 +101,7 @@ jobs: ################################################################################## build-40-images: - name: Build EpicMorg Advanced Zabbix Images + name: Build EpicMorg Advanced Zabbix 4.0 Images runs-on: ubuntu-22.04 steps: @@ -145,7 +145,7 @@ jobs: ################################################################################## build-50-images: - name: Build EpicMorg Advanced Zabbix Images + name: Build EpicMorg Advanced Zabbix 5.0 Images runs-on: ubuntu-22.04 steps: @@ -192,7 +192,7 @@ jobs: ################################################################################## build-52-images: - name: Build EpicMorg Advanced Zabbix Images + name: Build EpicMorg Advanced Zabbix 5.2 Images runs-on: ubuntu-22.04 steps: @@ -239,7 +239,7 @@ jobs: ################################################################################## build-54-images: - name: Build EpicMorg Advanced Zabbix Images + name: Build EpicMorg Advanced Zabbix 5.4 Images runs-on: ubuntu-22.04 steps: @@ -286,7 +286,7 @@ jobs: ################################################################################## build-60-images: - name: Build EpicMorg Advanced Zabbix Images + name: Build EpicMorg Advanced Zabbix 6.0 Images runs-on: ubuntu-22.04 steps: @@ -333,7 +333,7 @@ jobs: ################################################################################## build-62-images: - name: Build EpicMorg Advanced Zabbix Images + name: Build EpicMorg Advanced Zabbix 6.2 Images runs-on: ubuntu-22.04 steps: @@ -380,4 +380,4 @@ jobs: ################################################################################## - name: Cleanup - run: make clean + run: make docker-clean diff --git a/.github/workflows/epicmorg.base.images.yml b/.github/workflows/epicmorg.base.images.yml index 1e11c1296..0ea1f94da 100644 --- a/.github/workflows/epicmorg.base.images.yml +++ b/.github/workflows/epicmorg.base.images.yml @@ -1,4 +1,4 @@ -name: epicmorg.base.images +name: EpicMorg Base images on: # push: @@ -10,7 +10,7 @@ on: jobs: build-images: - name: Build EpicMorg Base images + name: Build EpicMorg Base Images runs-on: ubuntu-22.04 steps: @@ -28,3 +28,8 @@ jobs: - name: Build Bundle of Base Images run: make bundle-base-images + +################################################################################## + + - name: Cleanup + run: make docker-clean diff --git a/.github/workflows/torrserver-temp.yml b/.github/workflows/torrserver-temp.yml index a2c4fd324..fb4845a2f 100644 --- a/.github/workflows/torrserver-temp.yml +++ b/.github/workflows/torrserver-temp.yml @@ -31,3 +31,8 @@ jobs: - name: Push TorrServer run: cd linux/ecosystem/torrserver && make deploy + +################################################################################## + + - name: Cleanup + run: make docker-clean