Sort package names in Dockerfiles

This commit is contained in:
Tim Wojtulewicz 2022-06-03 15:00:15 -07:00
parent d8df7e9b42
commit 7bb5e196d7
14 changed files with 152 additions and 152 deletions

View file

@ -5,25 +5,25 @@ FROM alpine:latest
ENV DOCKERFILE_VERSION 20220519 ENV DOCKERFILE_VERSION 20220519
RUN apk add --no-cache \ RUN apk add --no-cache \
bash \
bison \
bsd-compat-headers \
ccache \ ccache \
cmake \ cmake \
make \ curl \
flex-dev \
fts-dev \
g++ \ g++ \
git \
libpcap-dev \
linux-headers \
make \
openssh-client \
openssl-dev \
py3-pip \
python3 \ python3 \
python3-dev \ python3-dev \
flex-dev \
bison \
libpcap-dev \
openssl-dev \
zlib-dev \
swig \ swig \
bash \ zlib-dev
bsd-compat-headers \
linux-headers \
fts-dev \
git \
curl \
openssh-client \
py3-pip
RUN pip3 install websockets junit2html RUN pip3 install websockets junit2html

View file

@ -31,21 +31,21 @@ RUN yum -y install \
&& yum clean all && rm -rf /var/cache/yum && yum clean all && rm -rf /var/cache/yum
RUN yum -y install \ RUN yum -y install \
bison \
cmake3 \ cmake3 \
curl \ curl \
findutils \
libpcap-devel \
make \ make \
bison \
swig \
openssl \ openssl \
openssl-devel \ openssl-devel \
libpcap-devel \
python3 \ python3 \
python3-devel \ python3-devel \
python3-pip\ python3-pip\
zlib-devel \
sqlite \ sqlite \
findutils \ swig \
which \ which \
zlib-devel \
&& yum clean all && rm -rf /var/cache/yum && yum clean all && rm -rf /var/cache/yum
# Install a recent flex for Spicy. # Install a recent flex for Spicy.

View file

@ -36,9 +36,9 @@ RUN dnf -y --nobest install \
python3-pip\ python3-pip\
sqlite \ sqlite \
swig \ swig \
tar \
which \ which \
zlib-devel \ zlib-devel \
tar \
&& dnf clean all && rm -rf /var/cache/dnf && dnf clean all && rm -rf /var/cache/dnf
# Set the crypto policy to allow SHA-1 certificates - which we have in our tests # Set the crypto policy to allow SHA-1 certificates - which we have in our tests

View file

@ -11,26 +11,26 @@ ENV CMAKE_VERSION "3.19.1"
ENV PATH "${CMAKE_DIR}/bin:${PATH}" ENV PATH "${CMAKE_DIR}/bin:${PATH}"
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get -y install \
git \
make \
gcc \
g++ \
flex \
bison \ bison \
bsdmainutils \
ccache \
curl \
flex \
g++ \
gcc \
git \
libkrb5-dev \
libpcap-dev \ libpcap-dev \
libssl-dev \ libssl-dev \
make \
python3 \ python3 \
python3-dev \ python3-dev \
python3-pip\ python3-pip\
swig \
zlib1g-dev \
libkrb5-dev \
bsdmainutils \
sqlite3 \ sqlite3 \
curl \ swig \
wget \ wget \
xz-utils \ xz-utils \
ccache \ zlib1g-dev \
&& apt autoclean \ && apt autoclean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

View file

@ -7,27 +7,27 @@ ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
ENV DOCKERFILE_VERSION 20220519 ENV DOCKERFILE_VERSION 20220519
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get -y install \
ccache \
git \
cmake \
make \
gcc \
g++ \
flex \
bison \ bison \
bsdmainutils \
ccache \
cmake \
curl \
flex \
g++ \
gcc \
git \
libkrb5-dev \
libpcap-dev \ libpcap-dev \
libssl-dev \ libssl-dev \
make \
python3 \ python3 \
python3-dev \ python3-dev \
python3-pip\ python3-pip\
swig \
zlib1g-dev \
libkrb5-dev \
bsdmainutils \
sqlite3 \ sqlite3 \
curl \ swig \
wget \ wget \
xz-utils \ xz-utils \
zlib1g-dev \
&& apt autoclean \ && apt autoclean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

View file

@ -11,27 +11,27 @@ ENV CMAKE_VERSION "3.19.1"
ENV PATH "${CMAKE_DIR}/bin:${PATH}" ENV PATH "${CMAKE_DIR}/bin:${PATH}"
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get -y install \
ccache \
git \
clang-11 \
make \
flex \
bison \ bison \
bsdmainutils \
ccache \
clang-11 \
curl \
flex \
git \
libc++-11-dev \ libc++-11-dev \
libc++abi-11-dev \ libc++abi-11-dev \
libkrb5-dev \
libpcap-dev \ libpcap-dev \
libssl-dev \ libssl-dev \
make \
python3 \ python3 \
python3-dev \ python3-dev \
python3-pip\ python3-pip\
swig \
zlib1g-dev \
libkrb5-dev \
bsdmainutils \
sqlite3 \ sqlite3 \
curl \ swig \
wget \ wget \
xz-utils \ xz-utils \
zlib1g-dev \
&& apt autoclean \ && apt autoclean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

View file

@ -11,27 +11,27 @@ ENV CMAKE_VERSION "3.19.1"
ENV PATH "${CMAKE_DIR}/bin:${PATH}" ENV PATH "${CMAKE_DIR}/bin:${PATH}"
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get -y install \
ccache \
git \
clang-11 \
make \
flex \
bison \ bison \
bsdmainutils \
ccache \
clang-11 \
curl \
flex \
git \
libc++-11-dev \ libc++-11-dev \
libc++abi-11-dev \ libc++abi-11-dev \
libkrb5-dev \
libpcap-dev \ libpcap-dev \
libssl-dev \ libssl-dev \
make \
python3 \ python3 \
python3-dev \ python3-dev \
python3-pip\ python3-pip\
swig \
zlib1g-dev \
libkrb5-dev \
bsdmainutils \
sqlite3 \ sqlite3 \
curl \ swig \
wget \ wget \
xz-utils \ xz-utils \
zlib1g-dev \
&& apt autoclean \ && apt autoclean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

View file

@ -5,8 +5,8 @@ FROM fedora:34
ENV DOCKERFILE_VERSION 20220519 ENV DOCKERFILE_VERSION 20220519
RUN dnf -y install \ RUN dnf -y install \
ccache \
bison \ bison \
ccache \
cmake \ cmake \
diffutils \ diffutils \
findutils \ findutils \

View file

@ -5,8 +5,8 @@ FROM fedora:35
ENV DOCKERFILE_VERSION 20220519 ENV DOCKERFILE_VERSION 20220519
RUN dnf -y install \ RUN dnf -y install \
ccache \
bison \ bison \
ccache \
cmake \ cmake \
diffutils \ diffutils \
findutils \ findutils \

View file

@ -7,31 +7,31 @@ ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
ENV DOCKERFILE_VERSION 20220519 ENV DOCKERFILE_VERSION 20220519
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get -y install \
ccache \ bc \
git \
cmake \
make \
gcc \
g++ \
flex \
bison \ bison \
bsdmainutils \
ccache \
cmake \
curl \
flex \
g++ \
gcc \
git \
lcov \
libkrb5-dev \
libmaxminddb-dev \
libpcap-dev \ libpcap-dev \
libssl-dev \ libssl-dev \
make \
python3 \ python3 \
python3-dev \ python3-dev \
python3-pip\ python3-pip\
swig \
zlib1g-dev \
libmaxminddb-dev \
libkrb5-dev \
bsdmainutils \
sqlite3 \
curl \
wget \
unzip \
ruby \ ruby \
bc \ sqlite3 \
lcov \ swig \
unzip \
wget \
zlib1g-dev \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Note - the symlink is important, otherwise cmake uses the wrong .so files. # Note - the symlink is important, otherwise cmake uses the wrong .so files.

View file

@ -7,25 +7,25 @@ ENV DOCKERFILE_VERSION 20220519
RUN zypper addrepo https://download.opensuse.org/repositories/openSUSE:Leap:15.2:Update/standard/openSUSE:Leap:15.2:Update.repo \ RUN zypper addrepo https://download.opensuse.org/repositories/openSUSE:Leap:15.2:Update/standard/openSUSE:Leap:15.2:Update.repo \
&& zypper refresh \ && zypper refresh \
&& zypper in -y \ && zypper in -y \
bison \
ccache \ ccache \
cmake \ cmake \
make \ curl \
flex \
gcc9 \ gcc9 \
gcc9-c++ \ gcc9-c++ \
git \
gzip \
libopenssl-devel \
libpcap-devel \
make \
python3 \ python3 \
python3-devel \ python3-devel \
flex \
bison \
libpcap-devel \
libopenssl-devel \
zlib-devel \
swig \
git \
curl \
python3-pip \ python3-pip \
which \ swig \
gzip \
tar \ tar \
which \
zlib-devel \
&& rm -rf /var/cache/zypp && rm -rf /var/cache/zypp
RUN pip3 install websockets junit2html RUN pip3 install websockets junit2html

View file

@ -11,29 +11,29 @@ ENV CMAKE_VERSION "3.19.1"
ENV PATH "${CMAKE_DIR}/bin:${PATH}" ENV PATH "${CMAKE_DIR}/bin:${PATH}"
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get -y install \
git \ bc \
clang-10 \
make \
flex \
bison \ bison \
bsdmainutils \
ccache \
clang-10 \
curl \
flex \
git \
lcov \
libkrb5-dev \
libmaxminddb-dev \
libpcap-dev \ libpcap-dev \
libssl-dev \ libssl-dev \
make \
python3 \ python3 \
python3-dev \ python3-dev \
python3-pip\ python3-pip\
swig \
zlib1g-dev \
libmaxminddb-dev \
libkrb5-dev \
bsdmainutils \
sqlite3 \
curl \
wget \
unzip \
ruby \ ruby \
bc \ sqlite3 \
lcov \ swig \
ccache \ unzip \
wget \
zlib1g-dev \
&& apt-get autoclean \ && apt-get autoclean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

View file

@ -7,31 +7,31 @@ ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
ENV DOCKERFILE_VERSION 20220519 ENV DOCKERFILE_VERSION 20220519
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get -y install \
ccache \ bc \
git \
cmake \
make \
gcc \
g++ \
flex \
bison \ bison \
bsdmainutils \
ccache \
cmake \
curl \
flex \
g++ \
gcc \
git \
lcov \
libkrb5-dev \
libmaxminddb-dev \
libpcap-dev \ libpcap-dev \
libssl-dev \ libssl-dev \
make \
python3 \ python3 \
python3-dev \ python3-dev \
python3-pip\ python3-pip\
swig \
zlib1g-dev \
libmaxminddb-dev \
libkrb5-dev \
bsdmainutils \
sqlite3 \
curl \
wget \
unzip \
ruby \ ruby \
bc \ sqlite3 \
lcov \ swig \
unzip \
wget \
zlib1g-dev \
&& apt autoclean \ && apt autoclean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

View file

@ -7,31 +7,31 @@ ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
ENV DOCKERFILE_VERSION 20220519 ENV DOCKERFILE_VERSION 20220519
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get -y install \
git \ bc \
bison \
bsdmainutils \
ccache \ ccache \
cmake \ cmake \
make \ curl \
gcc \
g++ \
flex \ flex \
bison \ g++ \
gcc \
git \
lcov \
libkrb5-dev \
libmaxminddb-dev \
libpcap-dev \ libpcap-dev \
libssl-dev \ libssl-dev \
make \
python3 \ python3 \
python3-dev \ python3-dev \
python3-pip\ python3-pip\
swig \
zlib1g-dev \
libmaxminddb-dev \
libkrb5-dev \
bsdmainutils \
sqlite3 \
curl \
wget \
unzip \
ruby \ ruby \
bc \ sqlite3 \
lcov \ swig \
unzip \
wget \
zlib1g-dev \
&& apt autoclean \ && apt autoclean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*