From 9a814ceac9bd37000d3af4c80e0520c8a97e3ea1 Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Thu, 6 May 2021 17:21:48 +0900 Subject: [PATCH] [Docker] update docker script (#976) - Use 'meson test -v' instead of 'ninja -C build test' - remove wireshark from docker development environment --- docker/docker-compose.test.yml | 2 +- docker/ubuntu/latest/dev/Dockerfile | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/docker-compose.test.yml b/docker/docker-compose.test.yml index 27e9f7e1b..1d26b594c 100644 --- a/docker/docker-compose.test.yml +++ b/docker/docker-compose.test.yml @@ -15,4 +15,4 @@ services: sysctls: - net.ipv6.conf.all.disable_ipv6=0 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" diff --git a/docker/ubuntu/latest/dev/Dockerfile b/docker/ubuntu/latest/dev/Dockerfile index 6902fc59c..970dddb72 100644 --- a/docker/ubuntu/latest/dev/Dockerfile +++ b/docker/ubuntu/latest/dev/Dockerfile @@ -23,12 +23,12 @@ RUN apt-get update && \ net-tools && \ apt-get clean -RUN apt-get update && \ - apt-get install -y software-properties-common && \ - sudo add-apt-repository ppa:wireshark-dev/stable -y && \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive \ - apt-get install -y wireshark +#RUN apt-get update && \ +# apt-get install -y software-properties-common && \ +# sudo add-apt-repository ppa:wireshark-dev/stable -y && \ +# apt-get update && \ +# DEBIAN_FRONTEND=noninteractive \ +# apt-get install -y wireshark COPY setup.sh /root