From 643998809bb6cafe8e878d8ea115bdafc4400686 Mon Sep 17 00:00:00 2001 From: timogoosen Date: Wed, 27 Apr 2022 14:26:24 +0200 Subject: [PATCH 01/14] Improving dockerfile and removing pipenv --- Dockerfile | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index bc1f050..851fbf8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,32 @@ FROM python:3 WORKDIR /plane-notify +USER root COPY . . -# 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 +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 + -# Install Chrome. -RUN apt-get update && apt-get -y install google-chrome-stable # Add pipenv RUN pip install pipenv==2021.5.29 From 7302ae85396acb00cfae9cbaec60188651e0e155 Mon Sep 17 00:00:00 2001 From: timogoosen Date: Wed, 27 Apr 2022 15:36:38 +0200 Subject: [PATCH 02/14] added more stuff --- Dockerfile | 11 ++++------- requirements.txt | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 requirements.txt diff --git a/Dockerfile b/Dockerfile index 851fbf8..a477612 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,13 +28,10 @@ RUN set -ex && \ -# Add pipenv -RUN pip install pipenv==2021.5.29 - -# Install dependencies -RUN pipenv install +RUN pip3 install --upgrade pip && \ + pip3 install -U --no-cache-dir -r ./requirements.txt # Added needed folder for plane-notify process -RUN mkdir /home/plane-notify +RUN mkdir -p /home/plane-notify -CMD pipenv run python /plane-notify/__main__.py \ No newline at end of file +CMD python3 /plane-notify/__main__.py \ No newline at end of file diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..6fc2eb5 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,14 @@ +# requirements.txt +colorama +geopy +tabulate +pytz +pillow +tweepy +pushbullet.py +discord-webhook +selenium +#opensky-api = {editable = true, git = "https://github.com/openskynetwork/opensky-api.git", subdirectory = "python"} +webdriver-manager +shapely +python-telegram-bot \ No newline at end of file From 3eb022962cc8e66963f1e298cb7ffd932258efdd Mon Sep 17 00:00:00 2001 From: timogoosen Date: Wed, 27 Apr 2022 15:42:26 +0200 Subject: [PATCH 03/14] updated requiremets.txt --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6fc2eb5..a86b9e1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,6 +9,7 @@ pushbullet.py discord-webhook selenium #opensky-api = {editable = true, git = "https://github.com/openskynetwork/opensky-api.git", subdirectory = "python"} +git+https://github.com/openskynetwork/opensky-api.git#egg=subdir&subdirectory=python" webdriver-manager shapely -python-telegram-bot \ No newline at end of file +python-telegram-bot From ae12a8836152252161f4c63a27e1b455e9264fdb Mon Sep 17 00:00:00 2001 From: timogoosen Date: Wed, 27 Apr 2022 15:46:50 +0200 Subject: [PATCH 04/14] try this instead --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a86b9e1..2ac154b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,8 @@ pushbullet.py discord-webhook selenium #opensky-api = {editable = true, git = "https://github.com/openskynetwork/opensky-api.git", subdirectory = "python"} -git+https://github.com/openskynetwork/opensky-api.git#egg=subdir&subdirectory=python" +# git+https://github.com/openskynetwork/opensky-api.git#egg=subdir&subdirectory=python" +https://github.com/openskynetwork/opensky-api/tree/master/python webdriver-manager shapely python-telegram-bot From 4a633fb8a3fa1d0e6565842113d40d22dbdd9ea7 Mon Sep 17 00:00:00 2001 From: timogoosen Date: Wed, 27 Apr 2022 15:48:23 +0200 Subject: [PATCH 05/14] see --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2ac154b..1211b01 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ discord-webhook selenium #opensky-api = {editable = true, git = "https://github.com/openskynetwork/opensky-api.git", subdirectory = "python"} # git+https://github.com/openskynetwork/opensky-api.git#egg=subdir&subdirectory=python" -https://github.com/openskynetwork/opensky-api/tree/master/python +-e https://github.com/openskynetwork/opensky-api/tree/master/python webdriver-manager shapely python-telegram-bot From d17c0ecbd39a1bcf0ce83027eff879030e0ee3b7 Mon Sep 17 00:00:00 2001 From: timogoosen Date: Wed, 27 Apr 2022 15:51:43 +0200 Subject: [PATCH 06/14] try again --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1211b01..497cfdb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ discord-webhook selenium #opensky-api = {editable = true, git = "https://github.com/openskynetwork/opensky-api.git", subdirectory = "python"} # git+https://github.com/openskynetwork/opensky-api.git#egg=subdir&subdirectory=python" --e https://github.com/openskynetwork/opensky-api/tree/master/python +-e "git+https://github.com/openskynetwork/opensky-api.git#egg=subdir&subdirectory=python" webdriver-manager shapely python-telegram-bot From 8474fc6ba7104a33c5c31146aaa324ee7a64b6f3 Mon Sep 17 00:00:00 2001 From: timogoosen Date: Wed, 27 Apr 2022 16:05:35 +0200 Subject: [PATCH 07/14] try like this,next without e --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 497cfdb..7a101ff 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ discord-webhook selenium #opensky-api = {editable = true, git = "https://github.com/openskynetwork/opensky-api.git", subdirectory = "python"} # git+https://github.com/openskynetwork/opensky-api.git#egg=subdir&subdirectory=python" --e "git+https://github.com/openskynetwork/opensky-api.git#egg=subdir&subdirectory=python" +-e "git+ssh://git@github.com/openskynetwork/opensky-api.git#subdirectory=python" webdriver-manager shapely python-telegram-bot From 622b1d2b839505282c192b8dcb0da4e66af8f9cc Mon Sep 17 00:00:00 2001 From: timogoosen Date: Wed, 27 Apr 2022 16:33:10 +0200 Subject: [PATCH 08/14] try again --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7a101ff..4ec9810 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ discord-webhook selenium #opensky-api = {editable = true, git = "https://github.com/openskynetwork/opensky-api.git", subdirectory = "python"} # git+https://github.com/openskynetwork/opensky-api.git#egg=subdir&subdirectory=python" --e "git+ssh://git@github.com/openskynetwork/opensky-api.git#subdirectory=python" +-e "git+ssh://git@github.com/openskynetwork/opensky-api.git#subdirectory=python#egg=opensky-api" webdriver-manager shapely python-telegram-bot From b1fda9f91fca7440cb45ba7c5a8f2ee23ab27b7a Mon Sep 17 00:00:00 2001 From: timogoosen Date: Wed, 27 Apr 2022 16:38:46 +0200 Subject: [PATCH 09/14] almost there --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4ec9810..92b4f35 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ discord-webhook selenium #opensky-api = {editable = true, git = "https://github.com/openskynetwork/opensky-api.git", subdirectory = "python"} # git+https://github.com/openskynetwork/opensky-api.git#egg=subdir&subdirectory=python" --e "git+ssh://git@github.com/openskynetwork/opensky-api.git#subdirectory=python#egg=opensky-api" +-e "git+https://github.com/openskynetwork/opensky-api.git#subdirectory=python#egg=opensky-api" webdriver-manager shapely python-telegram-bot From a9e96e14942de025cf8962b1f203c3d7fd1c3acd Mon Sep 17 00:00:00 2001 From: timogoosen Date: Wed, 27 Apr 2022 16:42:01 +0200 Subject: [PATCH 10/14] Gonna work now --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 92b4f35..f124dda 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ discord-webhook selenium #opensky-api = {editable = true, git = "https://github.com/openskynetwork/opensky-api.git", subdirectory = "python"} # git+https://github.com/openskynetwork/opensky-api.git#egg=subdir&subdirectory=python" --e "git+https://github.com/openskynetwork/opensky-api.git#subdirectory=python#egg=opensky-api" +"git+https://github.com/openskynetwork/opensky-api.git#subdirectory=python#egg=opensky-api" webdriver-manager shapely python-telegram-bot From 87b7818e0f2eb8120e8b4a7ed600d1d649c9e67a Mon Sep 17 00:00:00 2001 From: timogoosen Date: Wed, 27 Apr 2022 16:58:27 +0200 Subject: [PATCH 11/14] so close --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f124dda..a25a94d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ discord-webhook selenium #opensky-api = {editable = true, git = "https://github.com/openskynetwork/opensky-api.git", subdirectory = "python"} # git+https://github.com/openskynetwork/opensky-api.git#egg=subdir&subdirectory=python" -"git+https://github.com/openskynetwork/opensky-api.git#subdirectory=python#egg=opensky-api" +"git+https://github.com/openskynetwork/opensky-api.git#subdirectory=python&egg=opensky-api" webdriver-manager shapely python-telegram-bot From dfbf2e000782bf21aabf73e43a239298ada5d756 Mon Sep 17 00:00:00 2001 From: timogoosen Date: Wed, 27 Apr 2022 17:00:35 +0200 Subject: [PATCH 12/14] aa --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a25a94d..e88e8aa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ discord-webhook selenium #opensky-api = {editable = true, git = "https://github.com/openskynetwork/opensky-api.git", subdirectory = "python"} # git+https://github.com/openskynetwork/opensky-api.git#egg=subdir&subdirectory=python" -"git+https://github.com/openskynetwork/opensky-api.git#subdirectory=python&egg=opensky-api" +"git+https://github.com/openskynetwork/opensky-api.git#subdirectory=python&egg=python" webdriver-manager shapely python-telegram-bot From b87324ab1829f06d1b86e5e5bb53511db9361a74 Mon Sep 17 00:00:00 2001 From: timogoosen Date: Wed, 27 Apr 2022 17:05:18 +0200 Subject: [PATCH 13/14] try agian --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e88e8aa..45787a3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,8 @@ discord-webhook selenium #opensky-api = {editable = true, git = "https://github.com/openskynetwork/opensky-api.git", subdirectory = "python"} # git+https://github.com/openskynetwork/opensky-api.git#egg=subdir&subdirectory=python" -"git+https://github.com/openskynetwork/opensky-api.git#subdirectory=python&egg=python" +#"git+https://github.com/openskynetwork/opensky-api.git#subdirectory=python&egg=python" +git+ssh://git@github.com/openskynetwork/opensky-api.git@master#subdirectory=python/ webdriver-manager shapely python-telegram-bot From b9e42c3b1fc0aaeedfe69fcdbeaa05cefab139a2 Mon Sep 17 00:00:00 2001 From: timogoosen Date: Wed, 27 Apr 2022 17:09:52 +0200 Subject: [PATCH 14/14] This works --- requirements.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 45787a3..a3d9b36 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,10 +8,7 @@ tweepy pushbullet.py discord-webhook selenium -#opensky-api = {editable = true, git = "https://github.com/openskynetwork/opensky-api.git", subdirectory = "python"} -# git+https://github.com/openskynetwork/opensky-api.git#egg=subdir&subdirectory=python" -#"git+https://github.com/openskynetwork/opensky-api.git#subdirectory=python&egg=python" -git+ssh://git@github.com/openskynetwork/opensky-api.git@master#subdirectory=python/ +git+https://github.com/openskynetwork/opensky-api.git@master#subdirectory=python/ webdriver-manager shapely python-telegram-bot