From a9877bf4871533e55633ab2de03e308c46eba60a Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Wed, 13 Nov 2019 15:26:45 +0100 Subject: [PATCH] Update osmo-*/Dockerfile to log stdout+stderr of process to log file This way we get VTY parsing failures as well as backtraces upon process crash. Related: OS#4212 Change-Id: I9493ff73ef27c7c6d32b00cf827704b3f9cbf86a --- osmo-bsc-latest/Dockerfile | 2 +- osmo-bsc-master/Dockerfile | 2 +- osmo-bts-latest/Dockerfile | 4 ++-- osmo-bts-master/Dockerfile | 4 ++-- osmo-ggsn-latest/Dockerfile | 2 +- osmo-ggsn-latest/osmo-ggsn.cfg | 31 ++----------------------------- osmo-ggsn-master/Dockerfile | 2 +- osmo-ggsn-master/osmo-ggsn.cfg | 31 ++----------------------------- osmo-hlr-latest/Dockerfile | 2 +- osmo-hlr-master/Dockerfile | 4 ++-- osmo-hnbgw-latest/Dockerfile | 2 +- osmo-hnbgw-master/Dockerfile | 2 +- osmo-mgw-latest/Dockerfile | 2 +- osmo-mgw-latest/osmo-mgw.cfg | 2 +- osmo-mgw-master/Dockerfile | 2 +- osmo-msc-latest/Dockerfile | 4 ++-- osmo-msc-master/Dockerfile | 4 ++-- osmo-nitb-latest/Dockerfile | 2 +- osmo-nitb-master/Dockerfile | 2 +- osmo-remsim-latest/Dockerfile | 2 +- osmo-remsim-master/Dockerfile | 2 +- osmo-sgsn-latest/Dockerfile | 2 +- osmo-sgsn-master/Dockerfile | 2 +- osmo-sip-latest/Dockerfile | 2 +- osmo-sip-master/Dockerfile | 2 +- osmo-stp-latest/Dockerfile | 2 +- osmo-stp-latest/osmo-stp.cfg | 23 ----------------------- osmo-stp-master/Dockerfile | 2 +- osmo-stp-master/osmo-stp.cfg | 22 ---------------------- 29 files changed, 34 insertions(+), 133 deletions(-) diff --git a/osmo-bsc-latest/Dockerfile b/osmo-bsc-latest/Dockerfile index 1682dea2..5206a08c 100644 --- a/osmo-bsc-latest/Dockerfile +++ b/osmo-bsc-latest/Dockerfile @@ -29,6 +29,6 @@ VOLUME /data COPY osmo-bsc.cfg /data/osmo-bsc.cfg WORKDIR /data -CMD ["/usr/bin/osmo-bsc", "-c", "/data/osmo-bsc.cfg"] +CMD ["/bin/sh", "-c", "/usr/bin/osmo-bsc -c /data/osmo-bsc.cfg >/data/osmo-bsc.log 2>&1"] EXPOSE 3003 3002 4242 diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile index 3c3f90ac..75afbb77 100644 --- a/osmo-bsc-master/Dockerfile +++ b/osmo-bsc-master/Dockerfile @@ -44,6 +44,6 @@ VOLUME /data COPY osmo-bsc.cfg /data/osmo-bsc.cfg WORKDIR /data -CMD ["/usr/local/bin/osmo-bsc"] +CMD ["/bin/sh", "-c", "/usr/local/bin/osmo-bsc -c /data/osmo-bsc.cfg >/data/osmo-bsc.log 2>&1"] #EXPOSE diff --git a/osmo-bts-latest/Dockerfile b/osmo-bts-latest/Dockerfile index 05dcb246..05c27fd6 100644 --- a/osmo-bts-latest/Dockerfile +++ b/osmo-bts-latest/Dockerfile @@ -33,6 +33,6 @@ COPY osmo-bts.cfg /data/osmo-bts.cfg WORKDIR /data # send GSMTAP data to .230 which is the ttcn3-sysinfo test -CMD ["/usr/bin/osmo-bts-virtual", "-i", "172.18.0.230"] +CMD ["/bin/sh", "-c", "/usr/bin/osmo-bts-virtual -c /data/osmo-bts.cfg -i 172.18.0.230 >>/data/osmo-bts-virtual.log 2>&1"] -#EXPOSE +#EXPOSE diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile index a7f11450..b73f2ac6 100644 --- a/osmo-bts-master/Dockerfile +++ b/osmo-bts-master/Dockerfile @@ -46,6 +46,6 @@ COPY osmo-bts.cfg /data/osmo-bts.cfg WORKDIR /data # send GSMTAP data to .230 which is the ttcn3-sysinfo test -CMD ["/usr/local/bin/osmo-bts-virtual", "-i", "172.18.0.230"] +CMD ["/bin/sh", "-c", "/usr/local/bin/osmo-bts-virtual -c /data/osmo-bts.cfg -i 172.18.0.230 >>/data/osmo-bts-virtual.log 2>&1"] -#EXPOSE +#EXPOSE diff --git a/osmo-ggsn-latest/Dockerfile b/osmo-ggsn-latest/Dockerfile index c1ff3dc6..5259d518 100644 --- a/osmo-ggsn-latest/Dockerfile +++ b/osmo-ggsn-latest/Dockerfile @@ -27,6 +27,6 @@ VOLUME /data COPY osmo-ggsn.cfg /data/osmo-ggsn.cfg WORKDIR /data -CMD ["/usr/bin/osmo-ggsn"] +CMD ["/bin/sh", "-c", "/usr/bin/osmo-ggsn -c /data/osmo-ggsn.cfg >/data/osmo-ggsn.log 2>&1"] EXPOSE 3386/udp 2123/udp 2152/udp 4257/tcp 4260/tcp diff --git a/osmo-ggsn-latest/osmo-ggsn.cfg b/osmo-ggsn-latest/osmo-ggsn.cfg index 5337ac89..59a1c9cb 100644 --- a/osmo-ggsn-latest/osmo-ggsn.cfg +++ b/osmo-ggsn-latest/osmo-ggsn.cfg @@ -2,38 +2,11 @@ ! OpenGGSN (0.94.1-adac) configuration saved from vty !! ! -log file /data/openggsn.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level ip info - logging level tun info - logging level ggsn info - logging level sgsn notice - logging level icmp6 debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp info - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice log stderr logging filter all 1 logging color 1 - logging print category 0 - logging timestamp 0 + logging print category 1 + logging timestamp 1 logging level ip info logging level tun info logging level ggsn info diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile index f27bef98..38026705 100644 --- a/osmo-ggsn-master/Dockerfile +++ b/osmo-ggsn-master/Dockerfile @@ -38,6 +38,6 @@ VOLUME /data COPY osmo-ggsn.cfg /data/osmo-ggsn.cfg WORKDIR /data -CMD ["/usr/local/bin/osmo-ggsn"] +CMD ["/bin/sh", "-c", "/usr/local/bin/osmo-ggsn -c /data/osmo-ggsn.cfg >/data/osmo-ggsn.log 2>&1"] EXPOSE 3386/udp 2123/udp 2152/udp 4257/tcp 4260/tcp diff --git a/osmo-ggsn-master/osmo-ggsn.cfg b/osmo-ggsn-master/osmo-ggsn.cfg index 5337ac89..59a1c9cb 100644 --- a/osmo-ggsn-master/osmo-ggsn.cfg +++ b/osmo-ggsn-master/osmo-ggsn.cfg @@ -2,38 +2,11 @@ ! OpenGGSN (0.94.1-adac) configuration saved from vty !! ! -log file /data/openggsn.log - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level ip info - logging level tun info - logging level ggsn info - logging level sgsn notice - logging level icmp6 debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp info - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice log stderr logging filter all 1 logging color 1 - logging print category 0 - logging timestamp 0 + logging print category 1 + logging timestamp 1 logging level ip info logging level tun info logging level ggsn info diff --git a/osmo-hlr-latest/Dockerfile b/osmo-hlr-latest/Dockerfile index b54eef47..f00c2d9a 100644 --- a/osmo-hlr-latest/Dockerfile +++ b/osmo-hlr-latest/Dockerfile @@ -28,6 +28,6 @@ VOLUME /data COPY osmo-hlr.cfg /data/osmo-hlr.cfg WORKDIR /data -CMD ["/usr/bin/osmo-hlr"] +CMD ["/bin/sh", "-c", "/usr/bin/osmo-hlr -c /data/osmo-hlr.cfg >/data/osmo-hlr.log 2>&1"] EXPOSE 4222 4258 4259 diff --git a/osmo-hlr-master/Dockerfile b/osmo-hlr-master/Dockerfile index e9f9398d..6a09b0d1 100644 --- a/osmo-hlr-master/Dockerfile +++ b/osmo-hlr-master/Dockerfile @@ -42,6 +42,6 @@ VOLUME /data COPY osmo-hlr.cfg /data/osmo-hlr.cfg WORKDIR /data -CMD ["/usr/local/bin/osmo-hlr"] +CMD ["/bin/sh", "-c", "/usr/local/bin/osmo-hlr -c /data/osmo-hlr.cfg >/data/osmo-hlr.log 2>&1"] -#EXPOSE +#EXPOSE diff --git a/osmo-hnbgw-latest/Dockerfile b/osmo-hnbgw-latest/Dockerfile index 4456c8e9..161480ba 100644 --- a/osmo-hnbgw-latest/Dockerfile +++ b/osmo-hnbgw-latest/Dockerfile @@ -27,4 +27,4 @@ VOLUME /data COPY osmo-hnbgw.cfg /data/osmo-hnbgw.cfg WORKDIR /data -CMD ["/usr/bin/osmo-hnbgw", "-c", "/data/osmo-hnbgw.cfg"] +CMD ["/bin/sh", "-c", "/usr/bin/osmo-hnbgw -c /data/osmo-hnbgw.cfg >/data/osmo-hnbgw.log 2>&1"] diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile index af5bc912..951b95b9 100644 --- a/osmo-hnbgw-master/Dockerfile +++ b/osmo-hnbgw-master/Dockerfile @@ -43,4 +43,4 @@ VOLUME /data COPY osmo-hnbgw.cfg /data/osmo-hnbgw.cfg WORKDIR /data -CMD ["/usr/local/bin/osmo-hnbgw", "-c", "/data/osmo-hnbgw.cfg"] +CMD ["/bin/sh", "-c", "/usr/local/bin/osmo-hnbgw -c /data/osmo-hnbgw.cfg >/data/osmo-hnbgw.log 2>&1"] diff --git a/osmo-mgw-latest/Dockerfile b/osmo-mgw-latest/Dockerfile index e0afb1c1..9a403f8f 100644 --- a/osmo-mgw-latest/Dockerfile +++ b/osmo-mgw-latest/Dockerfile @@ -28,4 +28,4 @@ VOLUME /data COPY osmo-mgw.cfg /data/osmo-mgw.cfg WORKDIR /data -CMD ["/usr/bin/osmo-mgw"] +CMD ["/bin/sh", "-c", "/usr/bin/osmo-mgw -c /data/osmo-mgw.cfg >/data/osmo-mgw.log 2>&1"] diff --git a/osmo-mgw-latest/osmo-mgw.cfg b/osmo-mgw-latest/osmo-mgw.cfg index 44653e3b..23d5603e 100644 --- a/osmo-mgw-latest/osmo-mgw.cfg +++ b/osmo-mgw-latest/osmo-mgw.cfg @@ -6,7 +6,7 @@ log stderr logging filter all 1 logging color 1 logging print category 1 - logging timestamp 0 + logging timestamp 1 logging level all everything logging level rtp notice logging level lglobal notice diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile index 3df37c18..f898c7ef 100644 --- a/osmo-mgw-master/Dockerfile +++ b/osmo-mgw-master/Dockerfile @@ -43,4 +43,4 @@ VOLUME /data COPY osmo-mgw.cfg /data/osmo-mgw.cfg WORKDIR /data -CMD ["/usr/local/bin/osmo-mgw"] +CMD ["/bin/sh", "-c", "/usr/local/bin/osmo-mgw -c /data/osmo-mgw.cfg >/data/osmo-mgw.log 2>&1"] diff --git a/osmo-msc-latest/Dockerfile b/osmo-msc-latest/Dockerfile index 928c93ae..5780f715 100644 --- a/osmo-msc-latest/Dockerfile +++ b/osmo-msc-latest/Dockerfile @@ -29,6 +29,6 @@ VOLUME /data COPY osmo-msc.cfg /data/osmo-msc.cfg WORKDIR /data -CMD ["/usr/bin/osmo-msc"] +CMD ["/bin/sh", "-c", "/usr/bin/osmo-msc -c /data/osmo-msc.cfg >/data/osmo-msc.log 2>&1"] -#EXPOSE +#EXPOSE diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile index 21c7edae..55e5d6e9 100644 --- a/osmo-msc-master/Dockerfile +++ b/osmo-msc-master/Dockerfile @@ -49,6 +49,6 @@ VOLUME /data COPY osmo-msc.cfg /data/osmo-msc.cfg WORKDIR /data -CMD ["/usr/local/bin/osmo-msc"] +CMD ["/bin/sh", "-c", "/usr/local/bin/osmo-msc -c /data/osmo-msc.cfg >/data/osmo-msc.log 2>&1"] -#EXPOSE +#EXPOSE diff --git a/osmo-nitb-latest/Dockerfile b/osmo-nitb-latest/Dockerfile index 48cdf706..9e7ebdfd 100644 --- a/osmo-nitb-latest/Dockerfile +++ b/osmo-nitb-latest/Dockerfile @@ -31,6 +31,6 @@ COPY osmo-bsc-nat.cfg /data/osmo-bsc-nat.cfg COPY bscs.config /data/bscs.config WORKDIR /data -CMD ["/usr/bin/osmo-nitb"] +CMD ["/bin/sh", "-c", "/usr/bin/osmo-nitb -c /data/osmo-nitb.cfg >/data/osmo-nitb.log 2>&1"] EXPOSE 3002/tcp 3003/tcp 4242/tcp 2775/tcp 4249/tcp diff --git a/osmo-nitb-master/Dockerfile b/osmo-nitb-master/Dockerfile index 3e20ec88..0dad7fa1 100644 --- a/osmo-nitb-master/Dockerfile +++ b/osmo-nitb-master/Dockerfile @@ -46,6 +46,6 @@ COPY osmo-bsc-nat.cfg /data/osmo-bsc-nat.cfg COPY bscs.config /data/bscs.config WORKDIR /data -CMD ["/usr/local/bin/osmo-nitb"] +CMD ["/bin/sh", "-c", "/usr/local/bin/osmo-nitb -c /data/osmo-nitb.cfg >/data/osmo-nitb.log 2>&1"] EXPOSE 3002/tcp 3003/tcp 4242/tcp 2775/tcp 4249/tcp diff --git a/osmo-remsim-latest/Dockerfile b/osmo-remsim-latest/Dockerfile index a39aadbe..45c56016 100644 --- a/osmo-remsim-latest/Dockerfile +++ b/osmo-remsim-latest/Dockerfile @@ -33,6 +33,6 @@ VOLUME /data #COPY osmo-bts.cfg /data/osmo-bts.cfg WORKDIR /data -CMD ["/usr/bin/osmo-resmim-server"] +CMD ["/bin/sh", "-c", "/usr/bin/osmo-resmim-server >/data/osmo-resmim-server.log 2>&1"] #EXPOSE diff --git a/osmo-remsim-master/Dockerfile b/osmo-remsim-master/Dockerfile index acc70781..18df831c 100644 --- a/osmo-remsim-master/Dockerfile +++ b/osmo-remsim-master/Dockerfile @@ -48,6 +48,6 @@ VOLUME /data #COPY osmo-bts.cfg /data/osmo-bts.cfg WORKDIR /data -CMD ["/usr/local/bin/osmo-resmim-server"] +CMD ["/bin/sh", "-c", "/usr/local/bin/osmo-resmim-server >/data/osmo-resmim-server.log 2>&1"] #EXPOSE diff --git a/osmo-sgsn-latest/Dockerfile b/osmo-sgsn-latest/Dockerfile index 87dbca2a..6d89927e 100644 --- a/osmo-sgsn-latest/Dockerfile +++ b/osmo-sgsn-latest/Dockerfile @@ -27,6 +27,6 @@ VOLUME /data COPY osmo-sgsn.cfg /data/osmo-sgsn.cfg WORKDIR /data -CMD ["/usr/bin/osmo-sgsn"] +CMD ["/bin/sh", "-c", "/usr/bin/osmo-sgsn -c /data/osmo-sgsn.cfg >/data/osmo-sgsn.log 2>&1"] EXPOSE 23000/udp 4245/tcp 4249/tcp diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile index 9f317884..10fc92e4 100644 --- a/osmo-sgsn-master/Dockerfile +++ b/osmo-sgsn-master/Dockerfile @@ -48,6 +48,6 @@ VOLUME /data COPY osmo-sgsn.cfg /data/osmo-sgsn.cfg WORKDIR /data -CMD ["/usr/local/bin/osmo-sgsn"] +CMD ["/bin/sh", "-c", "/usr/local/bin/osmo-sgsn -c /data/osmo-sgsn.cfg >/data/osmo-sgsn.log 2>&1"] EXPOSE 23000/udp 4245/tcp 4249/tcp diff --git a/osmo-sip-latest/Dockerfile b/osmo-sip-latest/Dockerfile index a468c9fd..24dfefa8 100644 --- a/osmo-sip-latest/Dockerfile +++ b/osmo-sip-latest/Dockerfile @@ -27,6 +27,6 @@ VOLUME /data COPY osmo-sip-connector.cfg /data/osmo-sip-connector.cfg WORKDIR /data -CMD ["/usr/bin/osmo-sip-connector"] +CMD ["/bin/sh", "-c", "/usr/bin/osmo-sip-connector -c /data/osmo-sip-connector.cfg >/data/osmo-sip-connector.log 2>&1"] #EXPOSE diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile index 4a9d49bc..24079846 100644 --- a/osmo-sip-master/Dockerfile +++ b/osmo-sip-master/Dockerfile @@ -48,6 +48,6 @@ VOLUME /data COPY osmo-sip-connector.cfg /data/osmo-sip-connector.cfg WORKDIR /data -CMD ["/usr/local/bin/osmo-sip-connector"] +CMD ["/bin/sh", "-c", "/usr/local/bin/osmo-sip-connector -c /data/osmo-sip-connector.cfg >/data/osmo-sip-connector.log 2>&1"] #EXPOSE diff --git a/osmo-stp-latest/Dockerfile b/osmo-stp-latest/Dockerfile index 053e2abd..72872a1f 100644 --- a/osmo-stp-latest/Dockerfile +++ b/osmo-stp-latest/Dockerfile @@ -26,6 +26,6 @@ WORKDIR /tmp VOLUME /data COPY osmo-stp.cfg /data/ -CMD ["/usr/bin/osmo-stp", "-c", "/data/osmo-stp.cfg"] +CMD ["/bin/sh", "-c", "/usr/bin/osmo-stp -c /data/osmo-stp.cfg >/data/osmo-stp.log 2>&1"] EXPOSE 2905 14001 4239 diff --git a/osmo-stp-latest/osmo-stp.cfg b/osmo-stp-latest/osmo-stp.cfg index ada83785..e06a9e04 100644 --- a/osmo-stp-latest/osmo-stp.cfg +++ b/osmo-stp-latest/osmo-stp.cfg @@ -2,32 +2,9 @@ ! osmo-stp (0.0.6.3.179-b248) configuration saved from vty !! ! -log stderr logging filter all 1 logging color 1 logging print category 1 - logging timestamp 0 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp debug - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug -log file /data/osmo-stp.log - logging filter all 1 - logging color 0 - logging print category 1 logging timestamp 1 logging level all everything logging level lglobal notice diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile index fa490859..622d0b92 100644 --- a/osmo-stp-master/Dockerfile +++ b/osmo-stp-master/Dockerfile @@ -38,6 +38,6 @@ VOLUME /data COPY osmo-stp.cfg /data/ -CMD ["/usr/local/bin/osmo-stp", "-c", "/data/osmo-stp.cfg"] +CMD ["/bin/sh", "-c", "/usr/local/bin/osmo-stp -c /data/osmo-stp.cfg >/data/osmo-stp.log 2>&1"] EXPOSE 2905 14001 4239 diff --git a/osmo-stp-master/osmo-stp.cfg b/osmo-stp-master/osmo-stp.cfg index ada83785..1ab53ed0 100644 --- a/osmo-stp-master/osmo-stp.cfg +++ b/osmo-stp-master/osmo-stp.cfg @@ -6,28 +6,6 @@ log stderr logging filter all 1 logging color 1 logging print category 1 - logging timestamp 0 - logging level all everything - logging level lglobal notice - logging level llapd notice - logging level linp debug - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug -log file /data/osmo-stp.log - logging filter all 1 - logging color 0 - logging print category 1 logging timestamp 1 logging level all everything logging level lglobal notice