From 0ca20be11b8c0c868ec57b222b72bba9e7e371c2 Mon Sep 17 00:00:00 2001
From: Marc Schwind <marc.schwind@de.ibm.com>
Date: Fri, 13 Oct 2023 15:23:13 +0200
Subject: [PATCH 1/3] remove docker from controller

---
 core/controller/Dockerfile | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/core/controller/Dockerfile b/core/controller/Dockerfile
index cff07ed0f7d..432ff456c53 100644
--- a/core/controller/Dockerfile
+++ b/core/controller/Dockerfile
@@ -22,30 +22,12 @@ ENV UID=1001 \
 ENV SWAGGER_UI_DOWNLOAD_SHA256=3d7ef5ddc59e10f132fe99771498f0f1ba7a2cbfb9585f9863d4191a574c96e7 \
     SWAGGER_UI_VERSION=3.6.0
 
-###################################################################################################
-# It's needed for lean mode where the controller is also an invoker
-###################################################################################################
-# If you change the docker version here, it has implications on invoker runc support.
-# Docker server version and the invoker docker version must be the same to enable runc usage.
-# If this cannot be guaranteed, set `invoker_use_runc: false` in the ansible env.
-ENV DOCKER_VERSION=18.06.3-ce
-
 RUN apt update &&\
     # Upgrade installed packages to get latest security fixes if the base image does not contain them already.
     apt upgrade -y --no-install-recommends && \
     apt install -y \
      openssl
 
-# Uncomment to fetch latest version of docker instead: RUN wget -qO- https://get.docker.com | sh
-# Install docker client
-RUN curl -sSL -o docker-${DOCKER_VERSION}.tgz https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz && \
-    tar --strip-components 1 -xvzf docker-${DOCKER_VERSION}.tgz -C /usr/bin docker/docker && \
-    tar --strip-components 1 -xvzf docker-${DOCKER_VERSION}.tgz -C /usr/bin docker/docker-runc && \
-    rm -f docker-${DOCKER_VERSION}.tgz && \
-    chmod +x /usr/bin/docker && \
-    chmod +x /usr/bin/docker-runc
-##################################################################################################
-
 # Install swagger-ui
 RUN curl -sSL -o swagger-ui-v${SWAGGER_UI_VERSION}.tar.gz --no-verbose https://github.com/swagger-api/swagger-ui/archive/v${SWAGGER_UI_VERSION}.tar.gz && \
     echo "${SWAGGER_UI_DOWNLOAD_SHA256}  swagger-ui-v${SWAGGER_UI_VERSION}.tar.gz" | sha256sum -c - && \

From 8f35e45f9a015d729191405348ac39a5ce106beb Mon Sep 17 00:00:00 2001
From: Marc Schwind <marc.schwind@de.ibm.com>
Date: Fri, 13 Oct 2023 19:41:19 +0200
Subject: [PATCH 2/3] nuke docker from invoker image

---
 core/invoker/Dockerfile | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/core/invoker/Dockerfile b/core/invoker/Dockerfile
index d154cce9a35..ab2762828f0 100644
--- a/core/invoker/Dockerfile
+++ b/core/invoker/Dockerfile
@@ -19,7 +19,7 @@ FROM scala
 
 ENV UID=1001 \
     NOT_ROOT_USER=owuser
-    ENV DOCKER_VERSION=18.06.3-ce
+    
 # If you change the docker version here, it has implications on invoker runc support.
 # Docker server version and the invoker docker version must be the same to enable runc usage.
 # If this cannot be guaranteed, set `invoker_use_runc: false` in the ansible env.
@@ -30,14 +30,6 @@ RUN apt update &&\
     apt upgrade -y --no-install-recommends && \
     apt install -y \
      openssl
-# Uncomment to fetch latest version of docker instead: RUN wget -qO- https://get.docker.com | sh
-# Install docker client
-RUN curl -sSL -o docker-${DOCKER_VERSION}.tgz https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz && \
-    tar --strip-components 1 -xvzf docker-${DOCKER_VERSION}.tgz -C /usr/bin docker/docker && \
-    tar --strip-components 1 -xvzf docker-${DOCKER_VERSION}.tgz -C /usr/bin docker/docker-runc && \
-    rm -f docker-${DOCKER_VERSION}.tgz && \
-    chmod +x /usr/bin/docker && \
-    chmod +x /usr/bin/docker-runc
 
 ADD build/distributions/invoker.tar ./
 

From d01cb766fb8c794b8e5e3250d90b74fce3b7e3df Mon Sep 17 00:00:00 2001
From: Marc Schwind <marc.schwind@de.ibm.com>
Date: Fri, 13 Oct 2023 19:53:11 +0200
Subject: [PATCH 3/3] fix whitespace

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

diff --git a/core/invoker/Dockerfile b/core/invoker/Dockerfile
index ab2762828f0..d586a47f1c5 100644
--- a/core/invoker/Dockerfile
+++ b/core/invoker/Dockerfile
@@ -19,7 +19,7 @@ FROM scala
 
 ENV UID=1001 \
     NOT_ROOT_USER=owuser
-    
+
 # If you change the docker version here, it has implications on invoker runc support.
 # Docker server version and the invoker docker version must be the same to enable runc usage.
 # If this cannot be guaranteed, set `invoker_use_runc: false` in the ansible env.