From 8a4b5b7e8309268010f2daef036cd5ab407c3124 Mon Sep 17 00:00:00 2001
From: Ben Burns <803016+benjamincburns@users.noreply.github.com>
Date: Mon, 1 Aug 2022 23:28:59 +1200
Subject: [PATCH] Use ubuntu focal in docker image

---
 Dockerfile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8baed31..8c9bc4f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,20 @@
-FROM ubuntu:xenial
+FROM ubuntu:focal
 
 LABEL org.opencontainers.image.authors="benjamin.c.burns@gmail.com"
 
-RUN apt-get update && apt-get install -y python2 python2-dev iptables dnsmasq python-pip uml-utilities net-tools build-essential && apt-get clean
+RUN apt-get update && apt-get install -y python2 python2-dev iptables dnsmasq python-pip uml-utilities net-tools build-essential curl && apt-get clean
+
+RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py && python2 get-pip.py && rm get-pip.py
 
 COPY docker-image-config/docker-startup.sh switchedrelay.py limiter.py requirements.txt /opt/websockproxy/
 COPY docker-image-config/dnsmasq/interface docker-image-config/dnsmasq/dhcp /etc/dnsmasq.d/
 
 WORKDIR /opt/websockproxy/
 
-RUN python2 -m pip install -r /opt/websockproxy/requirements.txt
+RUN pip2 install -r /opt/websockproxy/requirements.txt
 
 EXPOSE 80
 
 CMD /opt/websockproxy/docker-startup.sh
 
+