diff options
| author |   khilman <khilman@users.noreply.github.com> | 2018-05-25 08:22:05 -0700 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2018-05-25 08:22:05 -0700 |
| commit | 2d79d03f5818c096535c9784b12df5ea99c0dbff (patch) | |
| tree | 74a361f40db3149eeecc6e468933c9ca968358ca /lava-master | |
| parent | b71a8c43342631b540ac2a3b05962f640f2f0fd7 (diff) | |
| parent | 287e03c09e34ec77d696fcd7ad55912cc127a859 (diff) | |
Merge pull request #25 from montjoie/miscfix03
Miscfix03
Diffstat (limited to 'lava-master')
| -rw-r--r-- | lava-master/Dockerfile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile index 607a79a..a65fd9a 100644 --- a/lava-master/Dockerfile +++ b/lava-master/Dockerfile @@ -33,11 +33,12 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install \ qemu-system \ qemu-system-arm \ qemu-system-i386 \ - qemu-kvm \ ser2net \ u-boot-tools \ python-setproctitle +RUN if [ "$(uname -m)" = "x86_64" -o "$(uname -m)" = "x86" ] ;then apt-get -y install qemu-kvm ; fi + #RUN service postgresql start \ # && DEBIAN_FRONTEND=noninteractive apt-get -y install \ # lava \ |