diff options
| author | Devaev Maxim <[email protected]> | 2019-04-13 22:06:28 +0300 |
|---|---|---|
| committer | Devaev Maxim <[email protected]> | 2019-04-13 22:06:28 +0300 |
| commit | cb56aeea0a46ac4d7588593ba5bb1f9f725e548c (patch) | |
| tree | 4deaa87b0fe9c0ebb28ae14f1af90a3f6af66de3 | |
| parent | 4353735e93bce964a6751cdafee3eac5b40dc5c8 (diff) | |
build fixes
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | testenv/Dockerfile | 31 |
2 files changed, 19 insertions, 24 deletions
@@ -2,13 +2,13 @@ # Author: Maxim Devaev <[email protected]> -[ -n "$_PLATFORMS" ] || _PLATFORMS="v1-vga v1-hdmi" -[ -n "$_BOARDS" ] || _BOARDS="rpi2 rpi3" +[ -n "$PIKVM_PLATFORM" ] || PIKVM_PLATFORM="v1-vga v1-hdmi" +[ -n "$PIKVM_BOARD" ] || PIKVM_BOARD="rpi2 rpi3" pkgname=(kvmd) -for _platform in $_PLATFORMS; do - for _board in $_BOARDS; do +for _platform in $PIKVM_PLATFORM; do + for _board in $PIKVM_BOARD; do pkgname+=(kvmd-platform-$_platform-$_board) done done @@ -94,8 +94,8 @@ package_kvmd() { } -for _platform in $_PLATFORMS; do - for _board in $_BOARDS; do +for _platform in $PIKVM_PLATFORM; do + for _board in $PIKVM_BOARD; do eval "package_kvmd-platform-$_platform-$_board() { pkgdesc=\"Pi-KVM platform configs - $_platform for $_board\" diff --git a/testenv/Dockerfile b/testenv/Dockerfile index e630ebbd..8586a410 100644 --- a/testenv/Dockerfile +++ b/testenv/Dockerfile @@ -11,7 +11,7 @@ RUN pacman -Syu --noconfirm \ jshon \ && (pacman -Sc --noconfirm || true) -RUN useradd -r -c "Packer build user" -s /sbin/nologin packer \ +RUN useradd -r -c "Packer build user" -m -d /var/packer -s /sbin/nologin packer \ && cd /tmp \ && sudo -u packer git clone https://aur.archlinux.org/packer-kit.git \ && cd packer-kit \ @@ -20,23 +20,18 @@ RUN useradd -r -c "Packer build user" -s /sbin/nologin packer \ && cd - \ && rm -rf /tmp/packer-kit -RUN pacman -Syy \ - && mkdir /.npm /home/packer \ - && chmod 777 /.npm /home/packer \ - && packer-user -S --needed --noconfirm \ - python \ - python-pip \ - python-tox \ - python-systemd \ - python-dbus \ - python-mako \ - nginx-mainline \ - ustreamer \ - socat \ - htmlhint \ - eslint \ - && rm -rf /.npm /home/packer \ - && (pacman -Sc --noconfirm || true) +RUN pkg-install \ + python \ + python-pip \ + python-tox \ + python-systemd \ + python-dbus \ + python-mako \ + nginx-mainline \ + ustreamer \ + socat \ + htmlhint \ + eslint RUN mkdir -p /etc/kvmd/nginx |