diff --git a/aprsc.dockerfile b/aprsc.dockerfile index 0dc03175921cba62603fe5a51b4effc94f379dab..636dfc3f3b7b74e0231753797b2c37e3b6d01930 100644 --- a/aprsc.dockerfile +++ b/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 diff --git a/docker-compose.yml b/docker-compose.yml index fa3b77041387a6801ae07da3e6c921b35efa4a68..ea3a2c05db77842c37e91b109ccc40a16b568b4a 100644 --- a/docker-compose.yml +++ b/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 diff --git a/trackdirect-apache.dockerfile b/trackdirect-apache.dockerfile index 5c71015e7134325c5177480bd344cb592811ba47..fb9ec2ad4b9444494dfcd896650983abbb531c46 100644 --- a/trackdirect-apache.dockerfile +++ b/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 diff --git a/trackdirect-python2.dockerfile b/trackdirect-python2.dockerfile index f949e6bdbcaa92b56332526b2c7bab4ae2e111f4..b307400f7403bb047e2d9fa355a38f0d40c665f4 100644 --- a/trackdirect-python2.dockerfile +++ b/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