diff options
| author | Devaev Maxim <[email protected]> | 2018-07-08 02:21:13 +0000 |
|---|---|---|
| committer | Devaev Maxim <[email protected]> | 2018-07-08 02:21:19 +0000 |
| commit | c24b6f83f8dd1b5a957798e1271969a022db41ad (patch) | |
| tree | ce517de62a1d8e16852d8b13dda1e2860167b2be /os | |
| parent | 1fe8475dc47e016e401399529ac76aa9ed16c487 (diff) | |
build fresh os image with a new kvmd
Diffstat (limited to 'os')
| -rw-r--r-- | os/Makefile | 1 | ||||
| -rw-r--r-- | os/platforms/v1/Dockerfile.part | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/os/Makefile b/os/Makefile index e96643a8..9b2b494a 100644 --- a/os/Makefile +++ b/os/Makefile @@ -11,6 +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'`" \ 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 16d08ee8..471e8566 100644 --- a/os/platforms/v1/Dockerfile.part +++ b/os/platforms/v1/Dockerfile.part @@ -1,3 +1,4 @@ +ARG KVMD_VERSION RUN pkg-install \ kvmd \ mjpg-streamer-pikvm \ |