From 073776a0980fd821b064bdced80112209283ff0d Mon Sep 17 00:00:00 2001 From: Pratik Raj Date: Fri, 28 Feb 2020 17:22:25 +0530 Subject: [PATCH 01/15] added some cleanup will reduce the container size --- atom/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/atom/Dockerfile b/atom/Dockerfile index 37764111e..5bb596d1b 100644 --- a/atom/Dockerfile +++ b/atom/Dockerfile @@ -31,7 +31,9 @@ RUN apt-get update && apt-get install -y \ ca-certificates \ gnupg \ wget \ - --no-install-recommends + --no-install-recommends \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Add the atom debian repo RUN wget -qO- https://packagecloud.io/AtomEditor/atom/gpgkey | apt-key add - @@ -56,7 +58,8 @@ RUN apt-get update && apt-get install -y \ libx11-xcb-dev \ xdg-utils \ --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* + apt-get clean && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Autorun atom ENTRYPOINT [ "atom", "--foreground" ] From af4152fa2a3655da840e4670722331371bd18de0 Mon Sep 17 00:00:00 2001 From: Pratik Raj Date: Fri, 28 Feb 2020 17:28:43 +0530 Subject: [PATCH 02/15] added some cleanup will reduce the container size --- cura/Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cura/Dockerfile b/cura/Dockerfile index f4e1504cf..b77478e7c 100644 --- a/cura/Dockerfile +++ b/cura/Dockerfile @@ -5,14 +5,12 @@ RUN apt-get update && apt-get install -y \ libgfortran4 \ libssl-dev \ wget \ - --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* + --no-install-recommends RUN wget https://gitlab.com/lulzbot3d/cura-le/cura-lulzbot/uploads/0676b39295476b93181fa8a512f34265/cura-lulzbot_3.2.21_amd64.deb -O /tmp/cura.deb \ - && apt update \ && dpkg -i /tmp/cura.deb || true \ && apt-get -yf install \ - && rm -rf /var/lib/apt/lists/* \ - && rm -rf /tmp/cura.deb + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* CMD ["cura-lulzbot"] From db355bb83103b8501ee7c91b292c8d92725be765 Mon Sep 17 00:00:00 2001 From: Pratik Raj Date: Fri, 28 Feb 2020 17:30:01 +0530 Subject: [PATCH 03/15] added some cleanup Will reduce the size of docker image --- gimp/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gimp/Dockerfile b/gimp/Dockerfile index b2dc6d593..2ce4ee117 100644 --- a/gimp/Dockerfile +++ b/gimp/Dockerfile @@ -14,6 +14,7 @@ LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ gimp \ --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* + apt-get clean && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ENTRYPOINT [ "gimp" ] From 763336eb0f3ff6b047a9ab874abc73bb07d75d49 Mon Sep 17 00:00:00 2001 From: Pratik Raj Date: Fri, 28 Feb 2020 17:31:42 +0530 Subject: [PATCH 04/15] added some cleanup Will reduce the container image size --- lynx/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lynx/Dockerfile b/lynx/Dockerfile index 8fdd0c3be..522183e36 100644 --- a/lynx/Dockerfile +++ b/lynx/Dockerfile @@ -10,6 +10,7 @@ LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ lynx \ --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* + apt-get clean && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ENTRYPOINT [ "lynx" ] From ff48a51d9c0bf7aedc3ea79051650a542a900abb Mon Sep 17 00:00:00 2001 From: Pratik Raj Date: Fri, 28 Feb 2020 17:33:07 +0530 Subject: [PATCH 05/15] doing some cleanup will reduce the image size --- nmap/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nmap/Dockerfile b/nmap/Dockerfile index 8ec0f1035..563d25595 100644 --- a/nmap/Dockerfile +++ b/nmap/Dockerfile @@ -4,6 +4,7 @@ LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ nmap \ --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* + apt-get clean && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ENTRYPOINT [ "nmap" ] From 14f3acfcca6b7fb98f1e179169a9f1cd5a517c9c Mon Sep 17 00:00:00 2001 From: Pratik Raj Date: Fri, 28 Feb 2020 17:35:05 +0530 Subject: [PATCH 06/15] doing some cleanup will reduce image size --- slapd/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/slapd/Dockerfile b/slapd/Dockerfile index f1a72c6ac..67c643018 100644 --- a/slapd/Dockerfile +++ b/slapd/Dockerfile @@ -32,7 +32,8 @@ RUN apt-get update && LC_ALL=C DEBIAN_FRONTEND=noninteractive \ ldap-utils \ slapd \ --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* + apt-get clean && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Just some default values for fun! ENV LDAP_ROOTPASS=fsociety LDAP_ORGANIZATION="E CORP" LDAP_DOMAIN=mr.robot.com From 5173b0ccac47316477637833ca7087807d8e24d0 Mon Sep 17 00:00:00 2001 From: Pratik Raj Date: Fri, 28 Feb 2020 17:35:53 +0530 Subject: [PATCH 07/15] Update Dockerfile --- slapd/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slapd/Dockerfile b/slapd/Dockerfile index 67c643018..fb81e7930 100644 --- a/slapd/Dockerfile +++ b/slapd/Dockerfile @@ -31,7 +31,7 @@ RUN apt-get update && LC_ALL=C DEBIAN_FRONTEND=noninteractive \ apt-get install -y \ ldap-utils \ slapd \ - --no-install-recommends \ + --no-install-recommends && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* From 0a524b85ccf39a01342aa6c0a13bb821c1f7bd1d Mon Sep 17 00:00:00 2001 From: Pratik Raj Date: Fri, 28 Feb 2020 17:37:11 +0530 Subject: [PATCH 08/15] Update Dockerfile --- nmap/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nmap/Dockerfile b/nmap/Dockerfile index 563d25595..f50129107 100644 --- a/nmap/Dockerfile +++ b/nmap/Dockerfile @@ -3,7 +3,7 @@ LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ nmap \ - --no-install-recommends \ + --no-install-recommends && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* From c6d6d4b369eaaeceec36e9a35f3412844022d888 Mon Sep 17 00:00:00 2001 From: Pratik Raj Date: Fri, 28 Feb 2020 17:37:51 +0530 Subject: [PATCH 09/15] Update Dockerfile --- lynx/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lynx/Dockerfile b/lynx/Dockerfile index 522183e36..c0f1da54a 100644 --- a/lynx/Dockerfile +++ b/lynx/Dockerfile @@ -9,7 +9,7 @@ LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ lynx \ - --no-install-recommends \ + --no-install-recommends && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* From a97662d481701dbac32c995f6fa717520d1bd218 Mon Sep 17 00:00:00 2001 From: Pratik Raj Date: Fri, 28 Feb 2020 17:39:05 +0530 Subject: [PATCH 10/15] Update Dockerfile --- gimp/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gimp/Dockerfile b/gimp/Dockerfile index 2ce4ee117..1c4ec974f 100644 --- a/gimp/Dockerfile +++ b/gimp/Dockerfile @@ -13,7 +13,7 @@ LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ gimp \ - --no-install-recommends \ + --no-install-recommends && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* From 722e06a6d9e880c90fc642052646e203a385bf0f Mon Sep 17 00:00:00 2001 From: Pratik Raj Date: Fri, 28 Feb 2020 17:40:00 +0530 Subject: [PATCH 11/15] Update Dockerfile --- atom/Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/atom/Dockerfile b/atom/Dockerfile index 5bb596d1b..117d0b624 100644 --- a/atom/Dockerfile +++ b/atom/Dockerfile @@ -31,9 +31,7 @@ RUN apt-get update && apt-get install -y \ ca-certificates \ gnupg \ wget \ - --no-install-recommends \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + --no-install-recommends # Add the atom debian repo RUN wget -qO- https://packagecloud.io/AtomEditor/atom/gpgkey | apt-key add - @@ -57,7 +55,7 @@ RUN apt-get update && apt-get install -y \ libxtst6 \ libx11-xcb-dev \ xdg-utils \ - --no-install-recommends \ + --no-install-recommends && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* From d4680dd826e3b20c3390efe8bfe68cdd5d6185ba Mon Sep 17 00:00:00 2001 From: Pratik Raj Date: Fri, 28 Feb 2020 17:41:40 +0530 Subject: [PATCH 12/15] cleanup --- slack/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/slack/Dockerfile b/slack/Dockerfile index cfdd8523b..82a6027f3 100644 --- a/slack/Dockerfile +++ b/slack/Dockerfile @@ -26,8 +26,7 @@ RUN apt-get update && apt-get install -y \ curl \ gnupg \ locales \ - --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* + --no-install-recommends RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ && locale-gen en_US.utf8 \ @@ -37,13 +36,14 @@ RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ RUN curl -sSL https://packagecloud.io/slacktechnologies/slack/gpgkey | apt-key add - RUN echo "deb https://packagecloud.io/slacktechnologies/slack/debian/ jessie main" > /etc/apt/sources.list.d/slacktechnologies_slack.list -RUN apt-get update && apt-get -y install \ +RUN apt-get -y install \ libasound2 \ libgtk-3-0 \ libx11-xcb1 \ libxkbfile1 \ slack-desktop \ - --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* + --no-install-recommends && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ENTRYPOINT ["/usr/lib/slack/slack"] From 3a63eb8b3d02f884165c3a958a22dc71fa564911 Mon Sep 17 00:00:00 2001 From: Pratik Raj Date: Fri, 28 Feb 2020 17:42:43 +0530 Subject: [PATCH 13/15] some cleanup --- skype/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/skype/Dockerfile b/skype/Dockerfile index e5b74b35c..bb1d0ec14 100644 --- a/skype/Dockerfile +++ b/skype/Dockerfile @@ -29,8 +29,9 @@ RUN echo "deb [arch=amd64] https://repo.skype.com/deb stable main" > /etc/apt/so RUN apt-get update && apt-get -y install \ skypeforlinux \ - --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* + --no-install-recommends && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* COPY run-skype-and-wait-for-exit /usr/local/bin From b252706e97c74b7c6351a4879f61a4185aac4154 Mon Sep 17 00:00:00 2001 From: Pratik Raj Date: Fri, 28 Feb 2020 17:43:32 +0530 Subject: [PATCH 14/15] Update Dockerfile --- s3cmd/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/s3cmd/Dockerfile b/s3cmd/Dockerfile index c9cb35632..fc574b68e 100644 --- a/s3cmd/Dockerfile +++ b/s3cmd/Dockerfile @@ -13,8 +13,9 @@ LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ ca-certificates \ s3cmd \ - --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* + --no-install-recommends && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Setup s3cmd config RUN { \ From 2fd0cf5235ac1dc25f50bdfd31caa124fefe9309 Mon Sep 17 00:00:00 2001 From: Pratik Raj Date: Fri, 28 Feb 2020 17:47:57 +0530 Subject: [PATCH 15/15] Update Dockerfile --- nomad/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nomad/Dockerfile b/nomad/Dockerfile index 781ddb8cc..ac877ed41 100644 --- a/nomad/Dockerfile +++ b/nomad/Dockerfile @@ -8,14 +8,13 @@ RUN apt-get update && apt-get install -y \ apt-transport-https \ ca-certificates \ curl \ - --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ + --no-install-recommends \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - -RUN apt-get update && apt-get install -y \ +RUN apt-get install -y \ gcc \ git \ g++ \ @@ -26,8 +25,9 @@ RUN apt-get update && apt-get install -y \ python \ yarn \ zip \ - --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* + --no-install-recommends && \ + apt-get clean && \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ENV NOMAD_VERSION v0.10.2