Version bump

This commit is contained in:
tkl 2021-02-01 10:35:15 +01:00
parent 82228120d9
commit fd1210b128
2 changed files with 7 additions and 5 deletions

View File

@ -2,13 +2,15 @@ FROM alpine:latest
RUN apk update && apk upgrade RUN apk update && apk upgrade
RUN apk add --update --no-cache python3 python3-dev git build-base freetype-dev && \ 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 # 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 apk add jpeg-dev zlib-dev
RUN pip install --upgrade pip && \ RUN pip install --upgrade pip && \
pip install wheel && \
pip install cython && \ pip install cython && \
pip install numpy && \ pip install numpy && \
pip install geopy && \ pip install geopy && \
@ -17,7 +19,7 @@ RUN pip install --upgrade pip && \
pip install pandas==1.0.0 pip install pandas==1.0.0
RUN git clone https://git.blackfinn.de/python/bicycle-statistics.git 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 RUN rm -rf bicycle-statistics
COPY run.sh /bin/ COPY run.sh /bin/

2
run.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/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 argument(s) given - execute argument(s) in container. Otherwise loop.
if [ "$#" -gt 0 ]; then if [ "$#" -gt 0 ]; then