From bd2704d6d8ec3f0f6d92121c0dbbdda010fe43b0 Mon Sep 17 00:00:00 2001
From: Per Qvarforth <per@qvarforth.se>
Date: Wed, 3 Aug 2022 10:10:31 +0000
Subject: [PATCH] adapted docker files to new heatmap solution

---
 docker-compose.yml             | 11 -----------
 trackdirect-apache.dockerfile  |  4 ++--
 trackdirect-python2.dockerfile |  2 --
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ea3a2c0..7e9bc02 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -36,17 +36,6 @@ services:
       - "db"
       - "aprsc"
 
-  heatmaps:
-    build:
-      context: .
-      dockerfile: trackdirect-python2.dockerfile
-    volumes:
-      - $PWD/config/trackdirect.ini:/root/trackdirect/config/trackdirect.ini
-      - $PWD/heatmaps:/root/trackdirect/htdocs/public/heatmaps
-    command: /root/trackdirect/server/scripts/heatmapcreator.sh trackdirect.ini /root/trackdirect/htdocs/public/heatmaps
-    depends_on:
-      - "db"
-
   web:
     build:
       context: .
diff --git a/trackdirect-apache.dockerfile b/trackdirect-apache.dockerfile
index fb9ec2a..44d0452 100644
--- a/trackdirect-apache.dockerfile
+++ b/trackdirect-apache.dockerfile
@@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y \
   inkscape \
   && rm -rf /var/lib/apt/lists/*
 
-RUN pecl install imagick && docker-php-ext-enable imagick && docker-php-ext-install pdo pdo_pgsql
+RUN pecl install imagick && docker-php-ext-enable imagick && docker-php-ext-install pdo pdo_pgsql && docker-php-ext-install gd && docker-php-ext-enable gd
 
 COPY . /root/trackdirect
 COPY config/000-default.conf /etc/apache2/sites-enabled/
@@ -19,5 +19,5 @@ COPY config/000-default.conf /etc/apache2/sites-enabled/
 RUN a2enmod rewrite
 RUN chmod a+rx / && chmod a+rx -R /root
 RUN chmod 777 /root/trackdirect/htdocs/public/symbols
+RUN chmod 777 /root/trackdirect/htdocs/public/heatmaps
 
-VOLUME /root/trackdirect/htdocs/public/heatmaps
diff --git a/trackdirect-python2.dockerfile b/trackdirect-python2.dockerfile
index b307400..889d9cb 100644
--- a/trackdirect-python2.dockerfile
+++ b/trackdirect-python2.dockerfile
@@ -13,8 +13,6 @@ RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py && pyt
 RUN pip2 install psycopg2-binary autobahn[twisted] twisted pympler image_slicer jsmin psutil
 
 RUN git clone https://github.com/rossengeorgiev/aprs-python && cd aprs-python && pip2 install .
-RUN wget http://jjguy.com/heatmap/heatmap-2.2.1.tar.gz && tar xzf heatmap-2.2.1.tar.gz && cd heatmap-2.2.1 && python2 setup.py install
 
 COPY . /root/trackdirect
 
-VOLUME /root/trackdirect/htdocs/public/heatmaps