From bd2a4374e7fa82050be9e1fd80ea7a4ae451298f Mon Sep 17 00:00:00 2001
From: Alex Barreto <axbarreto@lavabit.com>
Date: Sat, 8 May 2021 15:37:16 -0400
Subject: [PATCH] Dockerfile_alpine: fix broken pip six installation (#1568)

Fixes docker hub error:

```
Step 32/49 : RUN pip3 install --upgrade pip six grass-session
---> Running in 1c63e0d56789
Collecting pip
Downloading pip-21.1.1-py3-none-any.whl (1.5 MB)
Collecting six
Downloading six-1.16.0-py2.py3-none-any.whl (11 kB)
Collecting grass-session
Downloading grass_session-0.5-py2.py3-none-any.whl (31 kB)
Installing collected packages: pip, six, grass-session
Attempting uninstall: pip
Found existing installation: pip 20.0.2
Uninstalling pip-20.0.2:
Successfully uninstalled pip-20.0.2
Attempting uninstall: six
Found existing installation: six 1.15.0
ERROR: Cannot uninstall 'six'. It is a distutils installed project and thus we cannot accurately determine which files belong to it which would lead to only a partial uninstall.
```
---
 docker/alpine/Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile
index 068cbd84482..3d241cd7ee4 100644
--- a/docker/alpine/Dockerfile
+++ b/docker/alpine/Dockerfile
@@ -200,7 +200,11 @@ COPY --from=build /usr/local/grass* /usr/local/grass/
 RUN apk add curl && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py pip==20.0.2 && rm get-pip.py
 
 # install external Python API
+<<<<<<< HEAD:docker/alpine/Dockerfile
 RUN pip3 install --upgrade pip six grass-session --ignore-installed six
+=======
+RUN pip3 install --upgrade grass-session
+>>>>>>> da389cd55e (Dockerfile_alpine: fix broken pip six installation (#1568)):docker/alpine/Dockerfile_alpine
 
 RUN ln -s /usr/local/grass /usr/local/grass7
 RUN ln -s /usr/local/grass `grass --config path`