From 7f6fb49e50d599805f1a3f5383cea35a7d0cfaf1 Mon Sep 17 00:00:00 2001
From: tabledevil <tabledevil@gmail.com>
Date: Fri, 7 Oct 2022 13:16:51 +0200
Subject: [PATCH] Fuse Dockerfiles into one staged build

---
 Dockerfile                        | 28 ++++++++++++++++++++++++----
 Dockerfile_base                   |  9 ---------
 Dockerfile_update                 | 11 -----------
 dockerkaspersky_build_and_push.sh |  2 +-
 4 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100644 Dockerfile_base
 delete mode 100644 Dockerfile_update

diff --git a/Dockerfile b/Dockerfile
index 7c70c0c..dcaa438 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,32 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04 as base
+#Requirements
 LABEL maintainer="tabledevil"
 LABEL docker.cmd="docker run -it --rm -v /mnt/sdc1:/data tabledevil/kaspersky"
 RUN apt update && apt install -y wget perl
-RUN wget "https://products.s.kaspersky-labs.com/endpoints/keslinux10/10.1.1.6421/multilanguage-10.1.1.6421/babce9ef/kesl_10.1.1-6421_amd64.deb" && dpkg -i kesl_10.1.1-6421_amd64.deb && rm kesl_10.1.1-6421_amd64.deb
+
+#Fix Locale
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+ENV TERM=screen-256color
+RUN apt-get update \
+  && apt-get install -yq locales \
+  && locale-gen en_US.UTF-8 \
+  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+#Download & Install Kaspersky (TODO: Update to 11)
+RUN wget "https://products.s.kaspersky-labs.com/endpoints/keslinux10/10.1.1.6421/multilanguage-10.1.1.6421/babce9ef/kesl_10.1.1-6421_amd64.deb" 
+RUN dpkg -i kesl_10.1.1-6421_amd64.deb 
+RUN rm kesl_10.1.1-6421_amd64.deb
+
+#Copy answerfile and run setup
 ADD answer.txt /root/answer.txt
 RUN /opt/kaspersky/kesl/bin/kesl-setup.pl --autoinstall=/root/answer.txt ; true
+
+FROM ubuntu:20.04
+COPY --from=base / /
 ADD start.sh /root/start.sh
-add readme /root/readme
+ADD readme /root/readme
 RUN chmod +x /root/start.sh
 ENTRYPOINT ["/root/start.sh"]
-CMD ["shell"]
+CMD ["shell"]
\ No newline at end of file
diff --git a/Dockerfile_base b/Dockerfile_base
deleted file mode 100644
index c95f858..0000000
--- a/Dockerfile_base
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM ubuntu:20.04
-LABEL maintainer="tabledevil"
-LABEL docker.cmd="docker run -it --rm -v /mnt/sdc1:/data tabledevil/kaspersky"
-RUN apt update && apt install -y wget perl
-RUN wget "https://products.s.kaspersky-labs.com/endpoints/keslinux10/10.1.1.6421/multilanguage-10.1.1.6421/babce9ef/kesl_10.1.1-6421_amd64.deb" && dpkg -i kesl_10.1.1-6421_amd64.deb && rm kesl_10.1.1-6421_amd64.deb
-ADD answer.txt /root/answer.txt
-ADD start.sh /root/start.sh
-add readme /root/readme
-RUN chmod +x /root/start.sh
diff --git a/Dockerfile_update b/Dockerfile_update
deleted file mode 100644
index 1df3acb..0000000
--- a/Dockerfile_update
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM tabledevil/kaspersky:base
-LABEL maintainer="tabledevil"
-LABEL docker.cmd="docker run -it --rm -v /mnt/sdc1:/data tabledevil/kaspersky"
-RUN /opt/kaspersky/kesl/bin/kesl-setup.pl --autoinstall=/root/answer.txt ; true
-ADD answer.txt /root/answer.txt
-ADD start.sh /root/start.sh
-add readme /root/readme
-RUN chmod +x /root/start.sh
-ENTRYPOINT ["/root/start.sh"]
-CMD ["shell"]
-
diff --git a/dockerkaspersky_build_and_push.sh b/dockerkaspersky_build_and_push.sh
index a247cd6..42fe9bf 100755
--- a/dockerkaspersky_build_and_push.sh
+++ b/dockerkaspersky_build_and_push.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 build_date=$(date +%Y%m%d)
-docker build --no-cache -t "tabledevil/kaspersky:${build_date}" -f Dockerfile_update .
+docker build --no-cache -t "tabledevil/kaspersky:${build_date}" -f Dockerfile .
 docker login
 docker push "tabledevil/kaspersky:${build_date}"
 docker tag "tabledevil/kaspersky:${build_date}" "tabledevil/kaspersky:latest"