Fuse Dockerfiles into one staged build
This commit is contained in:
26
Dockerfile
26
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"]
|
||||
@@ -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
|
||||
@@ -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"]
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user