From fd1210b128cfdd0d51b441778996dad973e8cce1 Mon Sep 17 00:00:00 2001
From: tkl <tkl@blackfinn.de>
Date: Mon, 1 Feb 2021 10:35:15 +0100
Subject: [PATCH] Version bump

---
 Dockerfile | 10 ++++++----
 run.sh     |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6799046..8dc2724 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,13 +2,15 @@ FROM alpine:latest
 
 RUN apk update && apk upgrade
 
-RUN apk add --update --no-cache python3 python3-dev git build-base freetype-dev && \
-	if [ ! -e /usr/bin/python ]; then ln -f /usr/bin/python3 /usr/bin/python ; fi && \
-	if [ ! -e /usr/bin/pip ]; then ln -f /usr/bin/pip3 /usr/bin/pip ; fi
+RUN apk add --update --no-cache python3 python3-dev py-pip git build-base freetype-dev
+#&& \
+#	if [ ! -e /usr/bin/python ]; then ln -f /usr/bin/python3 /usr/bin/python ; fi && \
+#	if [ ! -e /usr/bin/pip ]; then ln -f /usr/bin/pip3 /usr/bin/pip ; fi
 
 RUN apk add jpeg-dev zlib-dev
 
 RUN pip install --upgrade pip && \
+	pip install wheel && \
     pip install cython && \
     pip install numpy && \
     pip install geopy && \
@@ -17,7 +19,7 @@ RUN pip install --upgrade pip && \
     pip install pandas==1.0.0
 
 RUN git clone https://git.blackfinn.de/python/bicycle-statistics.git
-RUN cd bicycle-statistics && python setup.py install
+RUN cd bicycle-statistics && python3 setup.py install
 RUN rm -rf bicycle-statistics
 
 COPY run.sh /bin/
diff --git a/run.sh b/run.sh
index b1f4e25..fb84c0f 100755
--- a/run.sh
+++ b/run.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-python -m bicycle_statistics /bs_in /bs_out
+python3 -m bicycle_statistics /bs_in /bs_out
 
 # if argument(s) given - execute argument(s) in container. Otherwise loop.
 if [ "$#" -gt 0 ]; then