From 88dcfb2afa67f3fbd672c4b4430192512997796b Mon Sep 17 00:00:00 2001
From: Vladimir <vladimir.nekrasov@harrison.ai>
Date: Wed, 6 Nov 2024 01:58:39 +0000
Subject: [PATCH 1/3] Add zlib 1.13.1

---
 base/Dockerfile | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/base/Dockerfile b/base/Dockerfile
index bd8ed58..dfcfbe6 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -90,6 +90,19 @@ RUN curl -LO "https://dl.k8s.io/release/v${KUBE_VERSION}/bin/linux/amd64/kubectl
     chmod +x kubectl && \
     mv kubectl /usr/local/bin
 
+# zlib packed in ubuntu is of version 1.12.11,
+# while newer versions give faster reads of gz files.
+ARG ZLIB_VERSION=1.13.1
+https://github.com/madler/zlib/releases/download/v1.3.1/zlib131.zip
+RUN curl -L -o "/tmp/zlib.zip" "https://github.com/madler/zlib/releases/download/v${ZLIB_VERSION}/zlib${ZLIB_VERSION//./}.zip" && \
+    unzip /tmp/zlib.zip -d /tmp
+WORKDIR /tmp/zlib-${ZLIB_VERSION}
+RUN ./configure && \
+    make install
+WORKDIR /
+RUN rm -rf /tmp/zlib*
+
+
 # Workaround issue described here https://github.com/harrison-ai/cobalt-docker-coder-dev/issues/8
 # Until Ubuntu upgrade.
 RUN curl -L -o "/tmp/sudo.deb" https://github.com/sudo-project/sudo/releases/download/SUDO_1_9_14p3/sudo_1.9.14-4_ubu2004_amd64.deb && \

From d0ceff0ca2fd8ae45ab045c6dda1532b95d77975 Mon Sep 17 00:00:00 2001
From: Vladimir <vladimir.nekrasov@harrison.ai>
Date: Wed, 6 Nov 2024 02:01:41 +0000
Subject: [PATCH 2/3] Add zlib 1.13.1

---
 base/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/base/Dockerfile b/base/Dockerfile
index dfcfbe6..ec7c992 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -92,8 +92,7 @@ RUN curl -LO "https://dl.k8s.io/release/v${KUBE_VERSION}/bin/linux/amd64/kubectl
 
 # zlib packed in ubuntu is of version 1.12.11,
 # while newer versions give faster reads of gz files.
-ARG ZLIB_VERSION=1.13.1
-https://github.com/madler/zlib/releases/download/v1.3.1/zlib131.zip
+ARG ZLIB_VERSION=1.3.1
 RUN curl -L -o "/tmp/zlib.zip" "https://github.com/madler/zlib/releases/download/v${ZLIB_VERSION}/zlib${ZLIB_VERSION//./}.zip" && \
     unzip /tmp/zlib.zip -d /tmp
 WORKDIR /tmp/zlib-${ZLIB_VERSION}

From 02e7ab661cbde1ae9c1855c9a4aa06fd10c5acac Mon Sep 17 00:00:00 2001
From: Vladimir <vladimir.nekrasov@harrison.ai>
Date: Mon, 11 Nov 2024 04:25:22 +0000
Subject: [PATCH 3/3] Make a single command for zlib install

---
 base/Dockerfile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/base/Dockerfile b/base/Dockerfile
index ec7c992..fbd9a9a 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -94,13 +94,12 @@ RUN curl -LO "https://dl.k8s.io/release/v${KUBE_VERSION}/bin/linux/amd64/kubectl
 # while newer versions give faster reads of gz files.
 ARG ZLIB_VERSION=1.3.1
 RUN curl -L -o "/tmp/zlib.zip" "https://github.com/madler/zlib/releases/download/v${ZLIB_VERSION}/zlib${ZLIB_VERSION//./}.zip" && \
-    unzip /tmp/zlib.zip -d /tmp
-WORKDIR /tmp/zlib-${ZLIB_VERSION}
-RUN ./configure && \
-    make install
-WORKDIR /
-RUN rm -rf /tmp/zlib*
-
+    unzip /tmp/zlib.zip -d /tmp && \
+    cd /tmp/zlib-${ZLIB_VERSION} && \
+    ./configure && \
+    make install && \
+    cd / && \
+    rm -rf /tmp/zlib*
 
 # Workaround issue described here https://github.com/harrison-ai/cobalt-docker-coder-dev/issues/8
 # Until Ubuntu upgrade.