From 62b5abd17097143a6b6efb30023401cb30eecd9e Mon Sep 17 00:00:00 2001 From: Zimovskii Anatolii Date: Fri, 9 Sep 2022 05:18:51 +0300 Subject: [PATCH] make - autocommit --- CHANGELOG.md | 1 + linux/ecosystem/epicmorg/debian/06-squeeze/main/Dockerfile | 2 +- linux/ecosystem/epicmorg/debian/06-squeeze/slim/Dockerfile | 5 ++--- .../epicmorg/debian/06-squeeze/slim/etc/apt/sources.list | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89e625ec5..9c8330bf2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Changelog ### 2022 * `sep` + * added `debian 6` and `debian 7` iamges. to build them - add `GRUB_CMDLINE_LINUX_DEFAULT="quiet vsyscall=emulate"` if you have newest kernel! * added `p2pool` and `monerod` servers. * added new versions of `jira` * added new versions of `confluence diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/main/Dockerfile b/linux/ecosystem/epicmorg/debian/06-squeeze/main/Dockerfile index 3715cfe84..4ce0e9744 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/main/Dockerfile @@ -12,7 +12,7 @@ ENV P4_DOWNLOAD_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bi # update lists ################################################################## RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ - apt-get update + GNUTLS_CPUID_OVERRIDE=0x1 apt-get update ################################################################## # installing utils diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/slim/Dockerfile b/linux/ecosystem/epicmorg/debian/06-squeeze/slim/Dockerfile index 3c5b732d8..fcd7f85c7 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/slim/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/slim/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:squeeze +FROM debian/eol:squeeze-slim LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -18,7 +18,6 @@ COPY etc/apt/apt.conf.d/99-no-check-valid-until /etc/apt/apt.conf.d/99-no-check- COPY etc/apt/sources.list /etc/apt/sources.list COPY etc/locale.gen /etc/locale.gen - RUN apt-get update && \ apt-get upgrade -y && \ apt-get dist-upgrade -y @@ -38,7 +37,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio console-cyrillic \ ca-certificates \ locales \ - software-properties-common \ +# 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 diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/slim/etc/apt/sources.list b/linux/ecosystem/epicmorg/debian/06-squeeze/slim/etc/apt/sources.list index 2b5c8a443..69a5f8040 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/slim/etc/apt/sources.list +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/slim/etc/apt/sources.list @@ -12,7 +12,7 @@ deb http://archive.debian.org/debian-backports/ squeeze-backports main contrib n deb-src http://archive.debian.org/debian-backports/ squeeze-backports main contrib non-free deb http://archive.debian.org/debian-backports/ squeeze-backports-sloppy main contrib non-free -deb-src http://archive.debian.org/debian-backports/ squeeze-backports main-sloppy contrib non-free +deb-src http://archive.debian.org/debian-backports/ squeeze-backports-sloppy main contrib non-free deb http://archive.debian.org/backports.org/ squeeze-backports main contrib non-free deb-src http://archive.debian.org/backports.org/ squeeze-backports main contrib non-free