From a613cbd93c503562bc4a246d8dfd03e46123ab44 Mon Sep 17 00:00:00 2001
From: Dmitry Chumak <mega.venik@gmail.com>
Date: Sun, 11 Dec 2022 15:44:43 +0300
Subject: [PATCH] http proxt settings env variables added

---
 .gitignore                |  1 +
 Dockerfile.deb            | 10 +++++-----
 Dockerfile.rpm            |  1 +
 config/deb/entrypoint.sh  |  5 +++++
 config/rpm/entrypoint.sh  |  2 ++
 proxy_settings.sh.example |  2 ++
 6 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 proxy_settings.sh.example

diff --git a/.gitignore b/.gitignore
index 0c2eb55..7ef7e6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 data/rpm/*
 data/deb/*
+proxy_settings.sh
diff --git a/Dockerfile.deb b/Dockerfile.deb
index 8d59f67..76385bc 100644
--- a/Dockerfile.deb
+++ b/Dockerfile.deb
@@ -1,21 +1,21 @@
 FROM debian:10.5-slim
 
-COPY config/deb/entrypoint.sh /opt/entrypoint.sh
 RUN apt-get update -q \
   && \
-    apt install -y -qq apt-mirror apt-transport-https software-properties-common wget \
+    apt install -y -qq apt-mirror apt-transport-https software-properties-common wget gnupg\
   && \
     apt-get autoremove \
   && \
-    rm -rf /var/cache/apt/* \
-  && \
-    mkdir -p /data/ \
+    rm -rf /var/cache/apt/*
+COPY config/deb/entrypoint.sh /opt/entrypoint.sh
+RUN mkdir -p /data/ \
   && \
     touch /var/log/cron.log \
   && \
     chmod u+x /opt/entrypoint.sh
 
 COPY config/deb/mirror.list /etc/apt/mirror.list
+COPY proxy_settings.sh /opt/proxy_settings.sh
 
 VOLUME ["/data/"]
 ENTRYPOINT ["/opt/entrypoint.sh"]
diff --git a/Dockerfile.rpm b/Dockerfile.rpm
index fe8e0b3..7180dc3 100644
--- a/Dockerfile.rpm
+++ b/Dockerfile.rpm
@@ -4,6 +4,7 @@ RUN yum -y install createrepo yum-utils
 RUN mkdir /data/ /etc/yum.repos.d/mirror/
 
 COPY config/rpm/entrypoint.sh /opt/entrypoint.sh
+COPY proxy_settings.sh /opt/proxy_settings.sh
 COPY config/rpm/repo_files/* /etc/yum.repos.d/mirror/
 
 VOLUME ["/data/"]
diff --git a/config/deb/entrypoint.sh b/config/deb/entrypoint.sh
index 041e255..b80630c 100755
--- a/config/deb/entrypoint.sh
+++ b/config/deb/entrypoint.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
 
 wget -q -O /usr/share/keyrings/grafana.key https://apt.grafana.com/gpg.key
+
+source /opt/proxy_settings.sh
+
+wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | gpg --dearmor -o /usr/share/keyrings/elasticsearch-keyring.gpg
+
 apt-mirror
diff --git a/config/rpm/entrypoint.sh b/config/rpm/entrypoint.sh
index 117dfa5..cdd6c49 100755
--- a/config/rpm/entrypoint.sh
+++ b/config/rpm/entrypoint.sh
@@ -5,6 +5,8 @@ do
 	dnf config-manager --add-repo /etc/yum.repos.d/mirror/$repo_file
 done
 
+source /opt/proxy_settings.sh
+
 # for gpg_key in $(find /tmp/gpg_keys)
 # do
 # 	rpm --import /tmp/gpg_keys/$gpg_key
diff --git a/proxy_settings.sh.example b/proxy_settings.sh.example
new file mode 100644
index 0000000..8c748bd
--- /dev/null
+++ b/proxy_settings.sh.example
@@ -0,0 +1,2 @@
+export https_proxy=https://
+export http_proxy=http://