Skip to content

Commit

Permalink
Remove empty lines from DPDK Dockerfile
Browse files Browse the repository at this point in the history
Blank lines within a RUN result in empty continuation line warning
during Docker build. Remove these empty lines.
  • Loading branch information
garyloug committed Jun 8, 2020
1 parent bd1f2ac commit 76e72b7
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions dist/images/Dockerfile.dpdk1911
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,20 @@ ENV PATH=${PATH}:/usr/share/ovn/scripts/
RUN dnf install -y --setopt=install_weak_deps=False \
make numactl-devel dpdk-devel meson \
unbound nc iptables ipset hostname \

# NOTE: Fedora 32 comes with gcc version 10. This caused LD linker issues during DPDK build.
# Install gcc version 9 and its dependencies.
https://kojipkgs.fedoraproject.org/packages/gcc/9.2.1/1.fc32.3/x86_64/cpp-9.2.1-1.fc32.3.x86_64.rpm \
https://kojipkgs.fedoraproject.org/packages/gcc/9.2.1/1.fc32.3/x86_64/libgomp-9.2.1-1.fc32.3.x86_64.rpm \
https://kojipkgs.fedoraproject.org/packages/gcc/9.2.1/1.fc32.3/x86_64/gcc-9.2.1-1.fc32.3.x86_64.rpm && \
dnf clean all && \

# Install DPDK
cd /usr/src/ && \
curl http://fast.dpdk.org/rel/dpdk-${DPDK_VERSION}.tar.gz | tar xz && \
cd ${DPDK_DIR} && \
meson builddir && cd builddir && \
meson configure -Dexamples='' -Dtests=false -Denable_kmods=false -Denable_docs=false && \
ninja && ninja install && \

# Clean Up
dnf remove -y make meson gcc cpp && \
dnf clean all

Expand Down

0 comments on commit 76e72b7

Please sign in to comment.