From d43be9601632c75d12a59e34fbce1d1248b7afda Mon Sep 17 00:00:00 2001
From: THEBAULT Julien <julien@thebault.co>
Date: Thu, 4 Jun 2020 17:01:37 +0000
Subject: [PATCH] Migrate from python 3.6 to python 3.7

---
 Dockerfile       | 13 ++++---------
 requirements.txt |  9 +++++----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 33d6690..19bfaa1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,13 @@
-FROM python:3.6 as build-stage
+FROM python:3.7-buster
 
-RUN mkdir /install
-WORKDIR /install
 COPY requirements.txt /requirements.txt
-RUN pip install --install-option="--prefix=/install" -r /requirements.txt
+RUN pip install -r /requirements.txt
 
+RUN groupadd --gid 1000 appuser \
+    && useradd --uid 1000 --gid appuser --shell /bin/bash --create-home appuser
 
-FROM python:3.6-alpine
-
-RUN addgroup -g 1000 appuser
-RUN adduser -D -u 1000 -G appuser appuser
 USER appuser
 RUN mkdir -p ~/.kube
-COPY --from=build-stage /install /usr/local
 COPY gitlab2rbac.py .
 
 ENTRYPOINT python gitlab2rbac.py
diff --git a/requirements.txt b/requirements.txt
index 51d6329..82ea521 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,6 @@
+PyJWT==1.7.1
+PyYAML==4.2b1
+Unidecode==1.1.1
 adal==1.2.0
 asn1crypto==0.24.0
 cachetools==3.0.0
@@ -9,16 +12,14 @@ google-auth==1.6.2
 idna==2.8
 kubernetes==8.0.1
 oauthlib==2.1.0
-pyasn1==0.4.5
 pyasn1-modules==0.2.3
+pyasn1==0.4.5
 pycparser==2.19
-PyJWT==1.7.1
 python-dateutil==2.7.5
 python-gitlab==1.7.0
 python-slugify==2.0.1
-PyYAML==4.2b1
-requests==2.21.0
 requests-oauthlib==1.0.0
+requests==2.21.0
 rsa==4.0
 six==1.12.0
 urllib3==1.24.2