From 46f75055616d74a6611e9a6a2324854aa9f96145 Mon Sep 17 00:00:00 2001
From: Tung Bui <tung.bquang@gmail.com>
Date: Sat, 16 Mar 2024 12:02:03 +0700
Subject: [PATCH 1/4] core: optimize the image size

---
 Dockerfile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 05abeb5..287b85b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -68,7 +68,7 @@ RUN mkdir /tmp/terraform_env/ && \
     wget https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip && \
     unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip && \
     cp  terraform /usr/local/bin/ && \
-    rm terraform_${TERRAFORM_VERSION}_linux_amd64.zip
+    rm -rf /tmp/terraform_env/
 
 # Install Kubectl
 ARG KUBECTL_VERSION=1.29.3
@@ -76,7 +76,8 @@ RUN mkdir /tmp/kubectl_env/ && \
     cd /tmp/kubectl_env/ && \
     curl -LO "https://dl.k8s.io/release/v$KUBECTL_VERSION/bin/linux/amd64/kubectl" && \
     chmod +x kubectl && \
-    mv ./kubectl /usr/local/bin/kubectl
+    mv ./kubectl /usr/local/bin/kubectl && \
+    rm -rf /tmp/kubectl_env/
 
 # Install Helm
 ARG HELM_VERSION=3.14.3
@@ -85,7 +86,7 @@ RUN mkdir /tmp/helm_env/ && \
     wget https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz && \
     tar -xvzf helm-v${HELM_VERSION}-linux-amd64.tar.gz && \
     mv linux-amd64/helm /usr/local/bin/helm && \
-    rm helm-v${HELM_VERSION}-linux-amd64.tar.gz
+    rm -rf /tmp/helm_env/
 
 # Install AwsCLI
 ARG AWSCLI_VERSION=2.15.30
@@ -94,7 +95,7 @@ RUN mkdir /tmp/awscli_env/ && \
     wget "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWSCLI_VERSION}.zip" && \
     unzip awscli-exe-linux-x86_64-${AWSCLI_VERSION}.zip && \
     ./aws/install && \
-    rm awscli-exe-linux-x86_64-${AWSCLI_VERSION}.zip
+    rm -rf /tmp/awscli_env/
 
 # Install AzureCLI
 ARG AZURECLI_VERSION=2.58.0

From 019f795a3995d860f5c7aa846fa95a9cffe702ce Mon Sep 17 00:00:00 2001
From: Tung Bui <tung.bquang@gmail.com>
Date: Sat, 16 Mar 2024 12:02:51 +0700
Subject: [PATCH 2/4] core: optimize the image size - --no-install-recommends

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 287b85b..ca65997 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ARG TZ=UTC
 RUN apt-get update
 
 # Install required packages
-RUN apt-get install -y \
+RUN apt-get install -y --no-install-recommends \
     software-properties-common \
     apt-transport-https \
     ca-certificates \

From df5cdef11f48096377eff428924b3544ed385046 Mon Sep 17 00:00:00 2001
From: Tung Bui <tung.bquang@gmail.com>
Date: Sat, 16 Mar 2024 12:05:23 +0700
Subject: [PATCH 3/4] core: optimize the image size - --no-install-recommends

---
 Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ca65997..91dbd7c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -99,7 +99,8 @@ RUN mkdir /tmp/awscli_env/ && \
 
 # Install AzureCLI
 ARG AZURECLI_VERSION=2.58.0
-RUN mkdir -p /etc/apt/keyrings && \
+RUN set -o pipefail && \
+    mkdir -p /etc/apt/keyrings && \
     curl -sLS https://packages.microsoft.com/keys/microsoft.asc | \
     gpg --dearmor | \
     tee /etc/apt/keyrings/microsoft.gpg > /dev/null && \
@@ -109,7 +110,7 @@ RUN mkdir -p /etc/apt/keyrings && \
     tee /etc/apt/sources.list.d/azure-cli.list && \
     apt-get update && \
     # Install a specific version
-    apt-get install azure-cli=$AZURECLI_VERSION-1~$AZ_DIST
+    apt-get install -y azure-cli=$AZURECLI_VERSION-1~$AZ_DIST --no-install-recommends
 
 # Cleanup
 RUN apt-get clean && \

From 379a4154f1a37bfb12165691e5ebba9b5ae1c988 Mon Sep 17 00:00:00 2001
From: Tung Bui <tung.bquang@gmail.com>
Date: Sat, 16 Mar 2024 12:40:20 +0700
Subject: [PATCH 4/4] core: optimize the image size pyton

---
 Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 91dbd7c..49c528b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,6 +48,8 @@ RUN mkdir /tmp/python_env/ && \
     ./configure --enable-optimizations && \
     make -j$(nproc) && \
     make install && \
+    # Do cleanup
+    make clean && \
     cd / && \
     rm -rf /tmp/python_env/
 
@@ -99,8 +101,7 @@ RUN mkdir /tmp/awscli_env/ && \
 
 # Install AzureCLI
 ARG AZURECLI_VERSION=2.58.0
-RUN set -o pipefail && \
-    mkdir -p /etc/apt/keyrings && \
+RUN mkdir -p /etc/apt/keyrings && \
     curl -sLS https://packages.microsoft.com/keys/microsoft.asc | \
     gpg --dearmor | \
     tee /etc/apt/keyrings/microsoft.gpg > /dev/null && \
@@ -110,7 +111,7 @@ RUN set -o pipefail && \
     tee /etc/apt/sources.list.d/azure-cli.list && \
     apt-get update && \
     # Install a specific version
-    apt-get install -y azure-cli=$AZURECLI_VERSION-1~$AZ_DIST --no-install-recommends
+    apt-get install --no-install-recommends -y azure-cli=$AZURECLI_VERSION-1~$AZ_DIST
 
 # Cleanup
 RUN apt-get clean && \