Merge pull request #123 from danwinship/alphabetize

NO-JIRA: Fix alphabetical ordering of packages in Dockerfiles

Dockerfile

@@ -16,16 +16,16 @@ RUN rm -rf /opt/bin/local-scripts && ln -s /opt/bin/network-tools /usr/bin/netwo
 
 # Make sure to maintain alphabetical ordering when adding new packages.
 RUN INSTALL_PKGS="\
+    bcc \
+    bcc-tools \
+    conntrack-tools \
+    iproute \
     nginx \
     numactl \
-    traceroute \
-    wireshark-cli \
-    conntrack-tools \
     perf \
-    iproute \
-    bcc \
-    bcc-tools \
     python3-bcc \
+    traceroute \
+    wireshark-cli \
     " && \
     yum -y install --setopt=tsflags=nodocs --setopt=skip_missing_names_on_install=False $INSTALL_PKGS && \
     yum clean all && rm -rf /var/cache/*

Dockerfile.fedora

@@ -19,12 +19,16 @@ COPY --from=tools /usr/bin/oc /usr/bin/oc
 RUN INSTALL_PKGS="\
     bash-completion \
     bc \
+    bcc \
+    bcc-tools \
     bind-utils \
     blktrace \
+    conntrack-tools \
     crash \
     e2fsprogs \
     ethtool \
     file \
+    fio \
     git \
     glibc-utils \
     gzip \
@@ -37,32 +41,26 @@ RUN INSTALL_PKGS="\
     ltrace \
     mailx \
     net-tools \
+    nginx \
     nmap-ncat \
+    numactl \
     parted \
     pciutils \
+    perf \
     procps-ng \
     psmisc \
-    perf \
+    python3-bcc \
     strace \
+    stress-ng \
     sysstat \
     tcpdump \
     tmux \
+    traceroute \
     util-linux \
     vim-enhanced \
     wget \
-    xfsprogs \
-    fio \
-    stress-ng \
-    nginx \
-    numactl \
-    traceroute \
     wireshark-cli \
-    conntrack-tools \
-    perf \
-    iproute \
-    bcc \
-    bcc-tools \
-    python3-bcc \
+    xfsprogs \
     " && \
     yum -y install --setopt=tsflags=nodocs --setopt=skip_missing_names_on_install=False $INSTALL_PKGS && \
     yum clean all && rm -rf /var/cache/*