summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-04-26 10:27:35 +0200
committerChristian Poessinger <christian@poessinger.com>2019-04-26 10:32:45 +0200
commitb1c495b72be765f616cd681a7ff0c9e194c67479 (patch)
tree4fdf4a8e78217a13c1242f5690a8474f9bdf6a8d /docker
parentdee033f97cfc9818bcf2143d79ff18726beb7c22 (diff)
downloadvyos-build-b1c495b72be765f616cd681a7ff0c9e194c67479.tar.gz
vyos-build-b1c495b72be765f616cd681a7ff0c9e194c67479.zip
Packages: extract kernel version from defaults.json
This requires 'jq' as part of the Docker container. $ cat data/defaults.json | jq '.kernel_version' | tr -d \"
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile5
1 files changed, 2 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index c4351555..21b38417 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -70,7 +70,8 @@ RUN apt-get update && apt-get install -y \
python3-sphinx \
python3-pystache \
pkg-config \
- debhelper
+ debhelper \
+ jq
RUN apt-get update && apt-get install -y -t jessie-backports \
python3-git \
@@ -280,8 +281,6 @@ RUN echo 'deb http://ftp.debian.org/debian stretch main' | tee -a /etc/apt/sourc
rm -rf /var/lib/apt/lists/*
# Install packer
-RUN apt-get update && apt-get install -y \
- jq
RUN export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | \
jq -r -M '.current_version')"; \
echo "url https://releases.hashicorp.com/packer/"$LATEST"/packer_"$LATEST"_linux_amd64.zip" |\