From c0c18b3f6d372ce4eff624fcb6d0ee85bff18e8a Mon Sep 17 00:00:00 2001
From: Mark Bumiller <mark.bumiller@gmail.com>
Date: Sat, 24 Dec 2022 13:32:03 -0500
Subject: [PATCH] exclusively using pipenv

basically reverts 7302ae85396acb00cfae9cbaec60188651e0e155
includes somes build speed improvements with order
---
 Dockerfile       | 44 ++++++++++++++++----------------------------
 requirements.txt | 22 ----------------------
 2 files changed, 16 insertions(+), 50 deletions(-)
 delete mode 100644 requirements.txt

diff --git a/Dockerfile b/Dockerfile
index a477612..38d9a8f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,37 +1,25 @@
 FROM python:3
 
 WORKDIR /plane-notify
-USER root 
 
-COPY . .
+# Added needed folder for plane-notify process
+RUN mkdir /home/plane-notify
 
-RUN set -ex && \
-    apt-get update -qq && \
-    apt-get -y -qq install --no-install-recommends \
-      ca-certificates \
-      gnupg && \
-    curl -sSL https://dl-ssl.google.com/linux/linux_signing_key.pub  | apt-key add -  && \ 
-    echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list && \
-    apt-get -y -qq update \
-    && apt-get -y -qq install --no-install-recommends \
-        bash \
-        curl \
-        google-chrome-stable \
-        python3 \
-        python3-dev \
-        python3-pip \
-        python3-setuptools \
-        python3-wheel \
-    && rm -rf \
-     /var/lib/apt/lists/* \
-     /var/cache/apt/archives
+# Set the Chrome repo.
+RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
+    && echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list
 
+# Install Chrome.
+RUN apt-get update && apt-get -y install --no-install-recommends \
+    google-chrome-stable \
+    python3-dev 
 
+# Add pipenv
+RUN pip install pipenv
 
-RUN pip3 install --upgrade pip && \
-    pip3 install -U --no-cache-dir -r ./requirements.txt 
+# Install dependencies
+COPY Pipfile* .
+RUN pipenv install
 
-# Added needed folder for plane-notify process
-RUN mkdir -p /home/plane-notify
-
-CMD python3 /plane-notify/__main__.py
\ No newline at end of file
+COPY . .
+CMD pipenv run python /plane-notify/__main__.py
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 0c21f8b..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-# requirements.txt
-colorama
-geopy
-tabulate
-pytz
-pillow
-tweepy
-discord-webhook
-selenium
-git+https://github.com/openskynetwork/opensky-api.git@master#subdirectory=python/
-webdriver-manager
-shapely
-pandas
-python-telegram-bot
-mastodon.py
-beautifulsoup4
-pycairo
-py-staticmaps
-pyproj
-lxml
-configparser
-geog