From 67860c2e8de4b28f33ab32c461fc61fec3cc23c7 Mon Sep 17 00:00:00 2001 From: Devaev Maxim Date: Sun, 8 Jul 2018 06:36:51 +0000 Subject: [PATCH] env hack --- os/Makefile | 2 +- os/platforms/v1/Dockerfile.part | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/os/Makefile b/os/Makefile index 9b2b494a..97cd4eeb 100644 --- a/os/Makefile +++ b/os/Makefile @@ -11,7 +11,7 @@ _pikvm: $(_BUILD_DIR) rm -rf $(_BUILD_DIR)/builder/scripts/pikvm cp -a platforms/$(PIKVM_PLATFORM) $(_BUILD_DIR)/stages/pikvm cd $(_BUILD_DIR) && make binfmt && make _rpi \ - BUILD_OPTS="--build-arg KVMD_VERSION=`bash -c '. ../kvmd/PKGBUILD; echo $pkgver'`" \ + BUILD_OPTS="--build-arg KVMD_VERSION=`bash -c '. ../kvmd/PKGBUILD; echo $$pkgver'`" \ PROJECT=pi-kvm \ PLATFORM=rpi-2 \ STAGES="__init__ os ssh watchdog ro pikvm __cleanup__" \ diff --git a/os/platforms/v1/Dockerfile.part b/os/platforms/v1/Dockerfile.part index 471e8566..1195182e 100644 --- a/os/platforms/v1/Dockerfile.part +++ b/os/platforms/v1/Dockerfile.part @@ -1,4 +1,6 @@ ARG KVMD_VERSION +RUN echo $KVMD_VERSION + RUN pkg-install \ kvmd \ mjpg-streamer-pikvm \