From dc0a5a32b9da34323bc7d2c4de3b7f652d6aea05 Mon Sep 17 00:00:00 2001
From: Andrew Hamilton <and_hamilton@yahoo.com>
Date: Mon, 27 Dec 2021 15:49:30 +1000
Subject: [PATCH] docker: Fix install.

- Need a newer version of pip to install eris.
- Eris has new --config and --version options.
- Not adding --apt-install-tools because tools are already bundled
  in the docker image.
---
 packaging/Dockerfile  | 1 +
 packaging/eris-docker | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packaging/Dockerfile b/packaging/Dockerfile
index c11ab3c..1313d76 100644
--- a/packaging/Dockerfile
+++ b/packaging/Dockerfile
@@ -4,6 +4,7 @@ FROM ubuntu:impish
 RUN apt-get update
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
 RUN apt-get install -y sudo python3.9 python3-pip
+RUN python3.9 -m pip install --upgrade pip
 COPY . eris
 RUN cd eris && ./install
 
diff --git a/packaging/eris-docker b/packaging/eris-docker
index 5f09c01..a70ee32 100755
--- a/packaging/eris-docker
+++ b/packaging/eris-docker
@@ -5,7 +5,7 @@ set -e
 
 
 DOCKER_IMAGE=eris
-ARGS=( $(getopt -u -o hiw:e:t:c: --long help,info,workers:,editor:,theme:,compression: -- "$@") )
+ARGS=( $(getopt -u -o hiw:e:t:c: --long help,info,version,workers:,editor:,theme:,compression:,config: -- "$@") )
 if [ "${ARGS[-1]}" == "--" ]; then
     OPTION_ARGS="${ARGS[@]:0:${#ARGS[@]}-1}"  # ARGS[:-1]
     DOCKER_ARGS="$DOCKER_IMAGE $OPTION_ARGS"