Merge pull request #12 from peterus/docker_update

Docker update

aprsc.dockerfile

@@ -12,9 +12,6 @@ RUN apt-get update && apt-get install -y \
   aprsc \
   && rm -rf /var/lib/apt/lists/*
 
-RUN rm /opt/aprsc/etc/aprsc.conf
-VOLUME /opt/aprsc/etc/aprsc.conf
-
 EXPOSE 10152
 EXPOSE 14580
 EXPOSE 10155

docker-compose.yml

@@ -4,7 +4,6 @@ services:
     build:
       context: .
       dockerfile: aprsc.dockerfile
-    restart: always
     ports:
       - "10152:10152"
       - "14580:14580"
@@ -17,7 +16,6 @@ services:
     build:
       context: .
       dockerfile: trackdirect-python2.dockerfile
-    restart: always
     volumes:
       - $PWD/config/trackdirect.ini:/root/trackdirect/config/trackdirect.ini
     command: /root/trackdirect/server/scripts/collector.sh trackdirect.ini 0
@@ -29,7 +27,6 @@ services:
     build:
       context: .
       dockerfile: trackdirect-python2.dockerfile
-    restart: always
     volumes:
       - $PWD/config/trackdirect.ini:/root/trackdirect/config/trackdirect.ini
     command: /root/trackdirect/server/scripts/wsserver.sh trackdirect.ini
@@ -43,7 +40,6 @@ services:
     build:
       context: .
       dockerfile: trackdirect-python2.dockerfile
-    restart: always
     volumes:
       - $PWD/config/trackdirect.ini:/root/trackdirect/config/trackdirect.ini
       - $PWD/heatmaps:/root/trackdirect/htdocs/public/heatmaps
@@ -55,7 +51,6 @@ services:
     build:
       context: .
       dockerfile: trackdirect-apache.dockerfile
-    restart: always
     volumes:
       - $PWD/config/trackdirect.ini:/root/trackdirect/config/trackdirect.ini
       - $PWD/heatmaps:/root/trackdirect/htdocs/public/heatmaps
@@ -68,7 +63,6 @@ services:
     build:
       context: .
       dockerfile: db.dockerfile
-    restart: always
     environment:
       POSTGRES_USER: root
       POSTGRES_PASSWORD: foobar

trackdirect-apache.dockerfile

@@ -20,7 +20,4 @@ RUN a2enmod rewrite
 RUN chmod a+rx / && chmod a+rx -R /root
 RUN chmod 777 /root/trackdirect/htdocs/public/symbols
 
-RUN rm /root/trackdirect/config/trackdirect.ini
-
-VOLUME /root/trackdirect/config/trackdirect.ini
 VOLUME /root/trackdirect/htdocs/public/heatmaps

trackdirect-python2.dockerfile

@@ -17,7 +17,4 @@ RUN wget http://jjguy.com/heatmap/heatmap-2.2.1.tar.gz && tar xzf heatmap-2.2.1.
 
 COPY . /root/trackdirect
 
-RUN rm /root/trackdirect/config/trackdirect.ini
-
-VOLUME /root/trackdirect/config/trackdirect.ini
 VOLUME /root/trackdirect/htdocs/public/heatmaps