chore(pipelined): devcontainer and bazel-base use needed depencies (m…

…agma#12285) Signed-off-by: Krisztián Varga <krisztian.varga@tngtech.com>
emakeev · Aug 5, 2022 · 07bc192 · 07bc192
1 parent 75a2c4b
commit 07bc192
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -71,6 +71,7 @@ RUN echo "Install general purpose packages" && \
         lld \
         lldb \
         make \
+        netbase \
         ninja-build \
         openjdk-8-jdk \
         perl \
@@ -334,12 +335,12 @@ ENV PYTHON_VENV_EXECUTABLE=${PYTHON_VENV}/bin/python${PYTHON_VERSION}
 RUN virtualenv --system-site-packages --python=/usr/bin/python${PYTHON_VERSION} ${PYTHON_VENV}
 RUN ${PYTHON_VENV_EXECUTABLE} -m pip install --quiet --upgrade --no-cache-dir "setuptools==49.6.0"
 
-### install python3-aioeventlet from the magma apt repo
+### install python3-aioeventlet and bcc-tools from the magma apt repo
 COPY orc8r/tools/ansible/roles/pkgrepo/files/jfrog.pub /tmp/
 RUN apt-key add /tmp/jfrog.pub && \
     echo "deb https://facebookconnectivity.jfrog.io/artifactory/list/dev-focal/ focal main" > /etc/apt/sources.list.d/fbc.list && \
     apt-get update -y && \
-    apt-get install -y python3-aioeventlet && \
+    apt-get install -y python3-aioeventlet bcc-tools && \
     rm -f /tmp/* && \
     rm -rf /var/lib/apt/lists/*  # delete lists that are downloaded by apt-get update
 

diff --git a/experimental/bazel-base/Dockerfile b/experimental/bazel-base/Dockerfile
@@ -46,6 +46,8 @@ RUN apt-get update && \
         lld \
         # dependency of python services (e.g. magmad)
         net-tools \
+        # dependency of python services (e.g. pipelined)
+        netbase \
         python3 \
         python-is-python3 \
         # dependency of python services (e.g. magmad)
@@ -57,6 +59,13 @@ RUN apt-get update && \
         wget \
         zip
 
+# Install depencies from facebook repository
+COPY orc8r/tools/ansible/roles/pkgrepo/files/jfrog.pub /tmp/
+RUN apt-key add /tmp/jfrog.pub && \
+    echo "deb https://facebookconnectivity.jfrog.io/artifactory/list/dev-focal/ focal main" > /etc/apt/sources.list.d/fbc.list && \
+    apt-get update -y && \
+    apt-get install -y bcc-tools
+
 # Install bazel
 WORKDIR /usr/sbin
 RUN wget --progress=dot:giga https://github.com/bazelbuild/bazelisk/releases/download/v1.10.0/bazelisk-linux-amd64 && \