Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(pipelined): devcontainer and bazel-base use needed depencies #12285

Merged
merged 1 commit into from
Mar 25, 2022
Merged

chore(pipelined): devcontainer and bazel-base use needed depencies #12285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions .devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ RUN echo "Install general purpose packages" && \
lld \
lldb \
make \
netbase \
ninja-build \
openjdk-8-jdk \
perl \
Expand Down Expand Up @@ -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

Expand Down
9 changes: 9 additions & 0 deletions experimental/bazel-base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 && \
Expand Down