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.

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

Updated Dockerfile-gnb to support USRP with srsGNB #13

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions Dockerfile-gnb
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,15 @@ RUN git clone --depth 1 --branch ${SRSRAN_BRANCH} https://github.com/srsran/srsR
# Install srsRAN build dependencies
ARG LIB
RUN /src/docker/scripts/install_dependencies.sh build && \
/src/docker/scripts/install_dependencies.sh extra
/src/docker/scripts/install_dependencies.sh extra && \
/src/docker/scripts/install_${LIB}_dependencies.sh build

ARG LIB_VERSION
ARG MARCH
ARG NUM_CORES

# Compile UHD/DPDK
# RUN /src/docker/scripts/build_${LIB}.sh ${LIB_VERSION} ${MARCH} ${NUM_CORES}
RUN /src/docker/scripts/build_${LIB}.sh ${LIB_VERSION} ${MARCH} ${NUM_CORES}

# Compile srsRAN Project and install it in the OS
ARG EXTRA_CMAKE_ARGS
Expand Down Expand Up @@ -92,14 +93,12 @@ ARG LIB
ARG LIB_VERSION

# Copy srsRAN binaries and libraries installed in previous stage
# COPY --from=builder /opt/${LIB}/${LIB_VERSION} /opt/${LIB}/${LIB_VERSION}
COPY --from=builder /opt/${LIB}/${LIB_VERSION} /opt/${LIB}/${LIB_VERSION}
COPY --from=builder /opt/srs /usr/local

# Copy the install dependencies scripts
# ADD docker/scripts/install_${LIB}_dependencies.sh /usr/local/etc/install_lib_dependencies.sh
# ADD docker/scripts/install_dependencies.sh /usr/local/etc/install_srsran_dependencies.sh
# ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/${LIB}/${LIB_VERSION}/lib/:/opt/${LIB}/${LIB_VERSION}/lib/x86_64-linux-gnu/:/opt/${LIB}/${LIB_VERSION}/lib/aarch64-linux-gnu/
# ENV PATH=$PATH:/opt/${LIB}/${LIB_VERSION}/bin/
# Set PATH/LD_PATH
ENV LD_LIBRARY_PATH=/opt/${LIB}/${LIB_VERSION}/lib/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
ENV PATH=$PATH:/opt/${LIB}/${LIB_VERSION}/bin/

# Install srsran and lib runtime dependencies
RUN apt-get update && \
Expand All @@ -110,7 +109,12 @@ RUN apt-get update && \
libyaml-cpp0.8 \
libdwarf1 \
libuhd4.6.0t64 \
libzmq3-dev && \
libzmq5 \
libdpdk-dev \
cpufrequtils \
inetutils-tools \
iputils-ping \
iproute2 && \
apt-get autoremove && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.2-dev
0.1.0
Loading