[Docker] update docker script (#976)
- Use 'meson test -v' instead of 'ninja -C build test' - remove wireshark from docker development environment
This commit is contained in:
parent
b4c1987ede
commit
9a814ceac9
|
@ -15,4 +15,4 @@ services:
|
||||||
sysctls:
|
sysctls:
|
||||||
- net.ipv6.conf.all.disable_ipv6=0
|
- net.ipv6.conf.all.disable_ipv6=0
|
||||||
hostname: open5gs-test
|
hostname: open5gs-test
|
||||||
command: /bin/bash -c "/root/setup.sh; cd open5gs && ninja -C build test"
|
command: /bin/bash -c "/root/setup.sh; cd open5gs/build && meson test -v"
|
||||||
|
|
|
@ -23,12 +23,12 @@ RUN apt-get update && \
|
||||||
net-tools && \
|
net-tools && \
|
||||||
apt-get clean
|
apt-get clean
|
||||||
|
|
||||||
RUN apt-get update && \
|
#RUN apt-get update && \
|
||||||
apt-get install -y software-properties-common && \
|
# apt-get install -y software-properties-common && \
|
||||||
sudo add-apt-repository ppa:wireshark-dev/stable -y && \
|
# sudo add-apt-repository ppa:wireshark-dev/stable -y && \
|
||||||
apt-get update && \
|
# apt-get update && \
|
||||||
DEBIAN_FRONTEND=noninteractive \
|
# DEBIAN_FRONTEND=noninteractive \
|
||||||
apt-get install -y wireshark
|
# apt-get install -y wireshark
|
||||||
|
|
||||||
COPY setup.sh /root
|
COPY setup.sh /root
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue