All the changes

.gitignore

@@ -1,12 +1,14 @@
 # Exclude
-config.py
+config*.py
 teslajson-master/
 master.zip
 *.pyc
-apiscraper.log
+*.log
 .idea
 hgt/*.zip
 hgt/*.hgt
 hgt/*.downloading
 *.iml
 provisioning/dashboards/*.json
+provisioning/dashboards/*.bak
+data/*

Dockerfile

@@ -28,9 +28,9 @@ RUN apt-get install -y nodejs
 # Install Grafana addons
 RUN apt-get -y install git
 WORKDIR /var/lib/grafana/plugins
-RUN git clone https://github.com/lephisto/grafana-trackmap-panel
+RUN git clone https://github.com/Lunars/grafana-trackmap-panel
 WORKDIR /var/lib/grafana/plugins/grafana-trackmap-panel
-RUN git checkout v2.0.4-teslascraper
+RUN git checkout master
 RUN npm install
 RUN npm audit fix
 RUN npm run build
@@ -39,7 +39,7 @@ RUN grafana-cli plugins install natel-discrete-panel
 # Install Tesla API Scraper
 RUN apt-get -y install python3-pip
 WORKDIR /
-RUN git clone https://github.com/lephisto/tesla-apiscraper
+RUN git clone https://github.com/Lunars/tesla-apiscraper
 RUN pip3 install influxdb
 
 RUN git clone https://github.com/tkrajina/srtm.py
@@ -49,7 +49,7 @@ WORKDIR /
 
 # Configure it
 WORKDIR tesla-apiscraper
-RUN git checkout v2019.5
+RUN git checkout master
 RUN cp config.py.dist config.py
 
 # Create temp files for dashboard API calls

Dockerfile.compose

@@ -2,37 +2,20 @@
 
 FROM debian:stretch-slim
 
-RUN apt-get -y update
+# Install Dependencies
+RUN apt-get update && apt-get install -y \
+    python3 \
+    python3-pip \
+ && rm -rf /var/lib/apt/lists/*
 
-# Install Python
-RUN apt-get -y install python3
-RUN apt-get -y install apt-transport-https
-RUN apt-get -y install curl
-RUN apt-get -y install gnupg2
-RUN apt-get -y install git
+# Install python dependencies. Do this before copying the entire project to keep cache.
+COPY requirements.txt /tmp/
+RUN pip3 install --requirement /tmp/requirements.txt
 
-# Install Tesla API Scraper
-RUN apt-get -y install python3-pip
-WORKDIR /
-RUN pip3 install influxdb
-
-RUN git clone https://github.com/tkrajina/srtm.py
-WORKDIR srtm.py
-RUN python3 ./setup.py install
-WORKDIR /
-
-ARG CACHEBUST=1
-ARG gitversion
-# Configure it
-RUN git clone https://github.com/lephisto/tesla-apiscraper
-WORKDIR tesla-apiscraper
-RUN git pull
-RUN git checkout $gitversion
-# Define our startup script
-RUN echo "#!/bin/bash" > /start.sh
-RUN echo "python3 /tesla-apiscraper/apiscraper.py" >> /start.sh
-RUN chmod +x /start.sh
+# Copy in this project
+COPY . /tesla-apiscraper
+WORKDIR /tesla-apiscraper
 
 # Run it
 EXPOSE 8023
-CMD /start.sh
+CMD ["python3", "/tesla-apiscraper/apiscraper.py"]