some cleanup and moving to put onload stuff at the bottom

This commit is contained in:
pfisher committed 2019-08-28 12:05:12 -04:00
1 parent 6452e95791
commit 839244243a
1 file changed
+15 -52
+15 -52
View File
@@ -1,44 +1,4 @@
# Dockerfile - Ubuntu Bionic Beaver
#
# Installs Solarflare's OpenOnload into Ubuntu Bionic.
#
# OpenOnload web page:
# https://www.openonload.org/
#
# To expose the host and onload to this container, run like this:
#
# docker run --net=host --device=/dev/onload --device=/dev/onload_epoll --device=/dev/onload_cplane -it ONLOAD_ENABLED_IMAGE_ID [COMMAND] [ARG...]
#
# NOTE: The host's OpenOnload version must be the same as the container's.
#
# Copyright (c) 2018 Neomantra BV
# Released under the MIT License, see LICENSE.txt
#
##### Onload Stuff #####
ARG ONLOAD_DEBIAN_BASE="ubuntu"
ARG ONLOAD_DEBIAN_TAG="bionic"
FROM ${ONLOAD_DEBIAN_BASE}:${ONLOAD_DEBIAN_TAG}
MAINTAINER Evan Wies <evan@neomantra.net>
# Onload version and its md5sum
ARG ONLOAD_VERSION="201811-u1"
ARG ONLOAD_MD5SUM="357e64862aa4145e49d218fd04e63407"
# When ONLOAD_WITHZF is non-empty, the build includes Solarflare's TCPDirect library.
# Default is to exclude it.
ARG ONLOAD_WITHZF
# 1) Install OpenOnload build dependencies
# 2) Download and verify OpenOnload from Solarflare's site
# 3) Extract, build, and install onload
# 4) Cleanup
########################
FROM ubuntu:bionic
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
autoconf \
@@ -66,7 +26,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
liblttng-ust-dev \
libncurses5-dev \
libreadline-dev \
libtool \
libtool \
libz-dev \
llvm \
locales \
@@ -175,22 +135,27 @@ run chmod +x /usr/bin/git-lfs && git lfs install
##### Onload Stuff #####
# Onload version and its md5sum
ARG ONLOAD_VERSION="201811-u1"
ARG ONLOAD_MD5SUM="357e64862aa4145e49d218fd04e63407"
# When ONLOAD_WITHZF is non-empty, the build includes Solarflare's TCPDirect library.
# Default is to exclude it.
ARG ONLOAD_WITHZF
# 1) Install OpenOnload build dependencies
# 2) Download and verify OpenOnload from Solarflare's site
# 3) Extract, build, and install onload
# 4) Cleanup
RUN \
DEBIAN_FRONTEND=noninteractive apt-get update -y \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
ca-certificates \
coreutils \
ethtool \
gcc-multilib \
kmod \
libc6-dev-i386 \
libpcap0.8-dev \
libtool-bin \
patch \
perl \
python-dev \
tar \
wget \
&& cd /tmp \
&& curl -fSL https://www.openonload.org/download/openonload-${ONLOAD_VERSION}.tgz -o /tmp/openonload-${ONLOAD_VERSION}.tgz \
&& echo "${ONLOAD_MD5SUM} openonload-${ONLOAD_VERSION}.tgz" | md5sum --check \
@@ -207,6 +172,4 @@ RUN \
patch \
&& DEBIAN_FRONTEND=noninteractive apt-get autoremove -y
# TODO: which apt packages can we remove?
########################