1
0
mirror of https://github.com/craigerl/aprsd.git synced 2024-11-21 23:55:17 -05:00

Dockerfile now produces aprsd.conf

This patch updates Dockerfile and Dockerfile-dev
to produce aprsd.conf instead of aprsd.yaml
This commit is contained in:
Hemna 2022-12-27 15:44:32 -05:00
parent e9a954a8fd
commit 02e4f78d0e
2 changed files with 5 additions and 5 deletions

View File

@ -41,7 +41,7 @@ RUN pip install aprsd==$APRSD_PIP_VERSION
# Ensure /config is there with a default config file # Ensure /config is there with a default config file
USER root USER root
RUN mkdir -p /config RUN mkdir -p /config
RUN aprsd sample-config > /config/aprsd.yml RUN aprsd sample-config > /config/aprsd.conf
RUN chown -R $APRS_USER:$APRS_USER /config RUN chown -R $APRS_USER:$APRS_USER /config
# override this to run another configuration # override this to run another configuration
@ -53,4 +53,4 @@ ADD bin/run.sh /usr/local/bin
ENTRYPOINT ["/usr/local/bin/run.sh"] ENTRYPOINT ["/usr/local/bin/run.sh"]
HEALTHCHECK --interval=5m --timeout=12s --start-period=30s \ HEALTHCHECK --interval=5m --timeout=12s --start-period=30s \
CMD aprsd healthcheck --config /config/aprsd.yml --url http://localhost:8001/stats CMD aprsd healthcheck --config /config/aprsd.conf --url http://localhost:8001/stats

View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
FROM ubuntu:focal as aprsd FROM ubuntu:22.04
# Dockerfile for building a container during aprsd development. # Dockerfile for building a container during aprsd development.
ARG BRANCH=master ARG BRANCH=master
@ -55,7 +55,7 @@ RUN ls -al /usr/local/bin
RUN ls -al /usr/bin RUN ls -al /usr/bin
RUN which aprsd RUN which aprsd
RUN mkdir -p /config RUN mkdir -p /config
RUN aprsd sample-config > /config/aprsd.yml RUN aprsd sample-config > /config/aprsd.conf
RUN chown -R $APRS_USER:$APRS_USER /config RUN chown -R $APRS_USER:$APRS_USER /config
# override this to run another configuration # override this to run another configuration
@ -67,4 +67,4 @@ ADD bin/run.sh $HOME/
ENTRYPOINT ["/home/aprs/run.sh"] ENTRYPOINT ["/home/aprs/run.sh"]
HEALTHCHECK --interval=5m --timeout=12s --start-period=30s \ HEALTHCHECK --interval=5m --timeout=12s --start-period=30s \
CMD aprsd healthcheck --config /config/aprsd.yml --url http://localhost:8001/stats CMD aprsd healthcheck --config /config/aprsd.conf --url http://localhost:8001/stats