diff options
| author | Daniil Baturin <daniil@baturin.org> | 2019-03-31 17:43:45 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2019-03-31 17:43:45 +0200 |
| commit | 020d7701a1a93f9791a911cd038dc2cd77ef1be6 (patch) | |
| tree | 39ac1efa5854f10394ccdf58d4661ac402140cf4 | |
| parent | bb3035804811a1491f3e68d1aa26bb270b425c22 (diff) | |
| parent | f3d9a912ea98018fa3390e4ff279803c58798bcd (diff) | |
| download | vyos-build-020d7701a1a93f9791a911cd038dc2cd77ef1be6.tar.gz vyos-build-020d7701a1a93f9791a911cd038dc2cd77ef1be6.zip | |
Merge branch 'current' of https://github.com/vyos/vyos-build into current
| -rw-r--r-- | docker/Dockerfile | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 46df8e4c..ebd8d56b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -45,7 +45,6 @@ RUN apt-get update && apt-get install -y \ mc \ pbuilder \ devscripts \ - python3-pystache \ squashfs-tools \ autoconf \ automake \ @@ -54,14 +53,9 @@ RUN apt-get update && apt-get install -y \ genisoimage \ lsb-release \ fakechroot \ - kernel-package \ libtool \ libglib2.0-dev \ - libboost-filesystem-dev \ libapt-pkg-dev \ - libncurses5-dev \ - flex \ - bison \ libperl-dev \ libnfnetlink-dev \ parted \ @@ -123,6 +117,10 @@ RUN apt-get update && apt-get install -y \ # Packages needed for kernel RUN apt-get update && apt-get install -y \ + kernel-package \ + libncurses5-dev \ + flex \ + bison \ libelf-dev # Packages needed for vyos-accel-ppp @@ -282,13 +280,6 @@ RUN echo 'deb http://ftp.debian.org/debian stretch main' | tee -a /etc/apt/sourc apt-get update && \ rm -rf /var/lib/apt/lists/* -# Update live-build -RUN echo 'deb http://ftp.debian.org/debian stretch main' | tee -a /etc/apt/sources.list.d/stretch.list && \ - apt-get update && apt-get install -y -t stretch live-build && \ - rm -f /etc/apt/sources.list.d/stretch.list && \ - apt-get update && \ - rm -rf /var/lib/apt/lists/* - # Install packer RUN export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | \ jq -r -M '.current_version')"; \ |