Dockerfile changes for consistency with Broker files

This commit is contained in:
Tim Wojtulewicz 2022-06-03 14:57:21 -07:00
parent 2977af93b5
commit d8df7e9b42
11 changed files with 20 additions and 5 deletions

View file

@ -13,12 +13,14 @@ RUN dnf -y install \
cmake \ cmake \
diffutils \ diffutils \
flex \ flex \
git \
gcc \ gcc \
gcc-c++ \ gcc-c++ \
git \
libpcap-devel \ libpcap-devel \
make \ make \
openssl \
openssl-devel \ openssl-devel \
python3 \
python3-devel \ python3-devel \
python3-pip\ python3-pip\
sqlite \ sqlite \

View file

@ -24,12 +24,14 @@ RUN dnf -y --nobest install \
cmake \ cmake \
diffutils \ diffutils \
flex \ flex \
git \
gcc \ gcc \
gcc-c++ \ gcc-c++ \
git \
libpcap-devel \ libpcap-devel \
make \ make \
openssl \
openssl-devel \ openssl-devel \
python3 \
python3-devel \ python3-devel \
python3-pip\ python3-pip\
sqlite \ sqlite \

View file

@ -31,6 +31,7 @@ RUN apt-get update && apt-get -y install \
wget \ wget \
xz-utils \ xz-utils \
ccache \ ccache \
&& apt autoclean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Install a recent CMake to build Spicy. # Install a recent CMake to build Spicy.

View file

@ -28,6 +28,7 @@ RUN apt-get update && apt-get -y install \
curl \ curl \
wget \ wget \
xz-utils \ xz-utils \
&& apt autoclean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN pip3 install websockets junit2html RUN pip3 install websockets junit2html

View file

@ -32,6 +32,7 @@ RUN apt-get update && apt-get -y install \
curl \ curl \
wget \ wget \
xz-utils \ xz-utils \
&& apt autoclean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Recent CMake. # Recent CMake.

View file

@ -32,13 +32,14 @@ RUN apt-get update && apt-get -y install \
curl \ curl \
wget \ wget \
xz-utils \ xz-utils \
&& apt autoclean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Recent CMake. # Recent CMake.
RUN mkdir -p "${CMAKE_DIR}" \ RUN mkdir -p "${CMAKE_DIR}" \
&& curl -sSL "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz" | tar xzf - -C "${CMAKE_DIR}" --strip-components 1 && curl -sSL "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz" | tar xzf - -C "${CMAKE_DIR}" --strip-components 1
# junit2html >= 31.0.0 requires jinj2 >= 3.0 which requires python >= 3.7 which is # junit2html >= 31.0.0 requires jinja2 >= 3.0 which requires python >= 3.7 which is
# a higher version of python3 than debian 9 provides. Fix the version of junit2html # a higher version of python3 than debian 9 provides. Fix the version of junit2html
# to the last version before they required the newer jinja2. # to the last version before they required the newer jinja2.
RUN pip3 install websockets junit2html==30.0.6 RUN pip3 install websockets junit2html==30.0.6

View file

@ -11,12 +11,14 @@ RUN dnf -y install \
diffutils \ diffutils \
findutils \ findutils \
flex \ flex \
git \
gcc \ gcc \
gcc-c++ \ gcc-c++ \
git \
libpcap-devel \ libpcap-devel \
make \ make \
openssl \
openssl-devel \ openssl-devel \
python3 \
python3-devel \ python3-devel \
python3-pip\ python3-pip\
sqlite \ sqlite \

View file

@ -11,12 +11,14 @@ RUN dnf -y install \
diffutils \ diffutils \
findutils \ findutils \
flex \ flex \
git \
gcc \ gcc \
gcc-c++ \ gcc-c++ \
git \
libpcap-devel \ libpcap-devel \
make \ make \
openssl \
openssl-devel \ openssl-devel \
python3 \
python3-devel \ python3-devel \
python3-pip\ python3-pip\
sqlite \ sqlite \

View file

@ -34,6 +34,7 @@ RUN apt-get update && apt-get -y install \
bc \ bc \
lcov \ lcov \
ccache \ ccache \
&& apt-get autoclean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Recent CMake. # Recent CMake.

View file

@ -32,6 +32,7 @@ RUN apt-get update && apt-get -y install \
ruby \ ruby \
bc \ bc \
lcov \ lcov \
&& apt autoclean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN pip3 install websockets junit2html RUN pip3 install websockets junit2html

View file

@ -32,6 +32,7 @@ RUN apt-get update && apt-get -y install \
ruby \ ruby \
bc \ bc \
lcov \ lcov \
&& apt autoclean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN pip3 install websockets junit2html RUN pip3 install websockets junit2html