summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-02-06 20:42:22 +0100
committerChristian Poessinger <christian@poessinger.com>2022-02-06 20:42:22 +0100
commit08b27e45e5fcce049769a8b0a65c0df49f63926f (patch)
treed11c4b367dc98dae3db938d42c4a55d893e0bf83
parentb4cbb6669527bd995e20952525e036d71ec0e36f (diff)
downloadvyos-build-08b27e45e5fcce049769a8b0a65c0df49f63926f.tar.gz
vyos-build-08b27e45e5fcce049769a8b0a65c0df49f63926f.zip
Revert "Docker: move Kernel "python-is-python2" requirement to the end"
This reverts commit 5271c0fa650ee48528aab21b7ac7ce4ffabac0ae.
-rw-r--r--docker/Dockerfile32
1 files changed, 16 insertions, 16 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index bddb072f..ac898a95 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -196,6 +196,19 @@ RUN apt-get update && apt-get install -y \
automake \
cpio
+# Packages needed for Linux Kernel
+# gnupg2 is required by Jenkins for the TAR verification
+RUN apt-get update && apt-get install -y \
+ gnupg2 \
+ rsync \
+ libncurses5-dev \
+ flex \
+ bison \
+ bc \
+ kmod \
+ cpio \
+ python-is-python2
+
# Packages needed for Intel QAT out-of-tree drivers
RUN apt-get update && apt-get install -y \
yasm
@@ -499,26 +512,13 @@ RUN apt-get update && apt-get install -y \
libtommath-dev \
libz-dev
-# Packages needed for Linux Kernel
-# gnupg2 is required by Jenkins for the TAR verification
-RUN apt-get update && apt-get install -y \
- gnupg2 \
- rsync \
- libncurses5-dev \
- flex \
- bison \
- bc \
- kmod \
- cpio \
- python-is-python2
-
# Creating image for embedded systems needs this utilities to prepare a image file
RUN apt-get update && apt-get install -y \
- parted \
- udev \
- zip
+ parted udev zip
+#
# fpm: a command-line program designed to help you build packages (e.g. deb)
+#
RUN apt-get update && apt-get install -y \
ruby \
ruby-dev \