From 726b39aedd089d5ad4addf55b1cc706c1006ebad Mon Sep 17 00:00:00 2001
From: Callum James Tait <callum.tait@photobox.com>
Date: Mon, 24 May 2021 22:30:04 +0100
Subject: [PATCH] feat: adding pip to base image

---
 runner/Dockerfile             | 4 +++-
 runner/Dockerfile.dindrunner  | 4 +++-
 runner/Dockerfile.ubuntu.1804 | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/runner/Dockerfile b/runner/Dockerfile
index 4c6eca32..996245de 100644
--- a/runner/Dockerfile
+++ b/runner/Dockerfile
@@ -37,7 +37,9 @@ RUN apt update -y \
     wget \
     zip \
     zstd \
-    python-is-python3 \
+    python3-pip \
+    && ln -sf /usr/bin/python3 /usr/bin/python \
+    && ln -sf /usr/bin/pip3 /usr/bin/pip \
     && rm -rf /var/lib/apt/lists/*
 
 RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
diff --git a/runner/Dockerfile.dindrunner b/runner/Dockerfile.dindrunner
index dedff382..50282350 100644
--- a/runner/Dockerfile.dindrunner
+++ b/runner/Dockerfile.dindrunner
@@ -32,9 +32,11 @@ RUN apt update -y \
     wget \
     zip \
     zstd \
-    python-is-python3 \
     iptables \
     supervisor \
+    python3-pip \
+    && ln -sf /usr/bin/python3 /usr/bin/python \
+    && ln -sf /usr/bin/pip3 /usr/bin/pip \
     && rm -rf /var/lib/apt/list/*
 
 # Runner user
diff --git a/runner/Dockerfile.ubuntu.1804 b/runner/Dockerfile.ubuntu.1804
index 44da2351..3a0f5bef 100644
--- a/runner/Dockerfile.ubuntu.1804
+++ b/runner/Dockerfile.ubuntu.1804
@@ -37,7 +37,9 @@ RUN apt update -y \
     wget \
     zip \
     zstd \
-    && cd /usr/bin && ln -sf python3 python \
+    python3-pip \
+    && ln -sf /usr/bin/python3 /usr/bin/python \
+    && ln -sf /usr/bin/pip3 /usr/bin/pip \
     && rm -rf /var/lib/apt/lists/*
 
 RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \