GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 01:00:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

build fixes

Browse Source
This commit is contained in:
Devaev Maxim 2019-04-13 22:06:28 +03:00
parent 4353735e93
commit cb56aeea0a
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PKGBUILD
View File

@ -2,13 +2,13 @@
# Author: Maxim Devaev <mdevaev@gmail.com> # Author: Maxim Devaev <mdevaev@gmail.com>
[ -n "$_PLATFORMS" ] || _PLATFORMS="v1-vga v1-hdmi" [ -n "$PIKVM_PLATFORM" ] || PIKVM_PLATFORM="v1-vga v1-hdmi"
[ -n "$_BOARDS" ] || _BOARDS="rpi2 rpi3" [ -n "$PIKVM_BOARD" ] || PIKVM_BOARD="rpi2 rpi3"
pkgname=(kvmd) pkgname=(kvmd)
for _platform in $_PLATFORMS; do for _platform in $PIKVM_PLATFORM; do
for _board in $_BOARDS; do for _board in $PIKVM_BOARD; do
pkgname+=(kvmd-platform-$_platform-$_board) pkgname+=(kvmd-platform-$_platform-$_board)
done done
done done
@ -94,8 +94,8 @@ package_kvmd() {
} }
for _platform in $_PLATFORMS; do for _platform in $PIKVM_PLATFORM; do
for _board in $_BOARDS; do for _board in $PIKVM_BOARD; do
eval "package_kvmd-platform-$_platform-$_board() { eval "package_kvmd-platform-$_platform-$_board() {
pkgdesc=\"Pi-KVM platform configs - $_platform for $_board\" pkgdesc=\"Pi-KVM platform configs - $_platform for $_board\"

11
testenv/Dockerfile
View File

@ -11,7 +11,7 @@ RUN pacman -Syu --noconfirm \
jshon \ jshon \
&& (pacman -Sc --noconfirm || true) && (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 \ && cd /tmp \
&& sudo -u packer git clone https://aur.archlinux.org/packer-kit.git \ && sudo -u packer git clone https://aur.archlinux.org/packer-kit.git \
&& cd packer-kit \ && cd packer-kit \
@ -20,10 +20,7 @@ RUN useradd -r -c "Packer build user" -s /sbin/nologin packer \
&& cd - \ && cd - \
&& rm -rf /tmp/packer-kit && rm -rf /tmp/packer-kit
RUN pacman -Syy \ RUN pkg-install \
&& mkdir /.npm /home/packer \
&& chmod 777 /.npm /home/packer \
&& packer-user -S --needed --noconfirm \
python \ python \
python-pip \ python-pip \
python-tox \ python-tox \
@ -34,9 +31,7 @@ RUN pacman -Syy \
ustreamer \ ustreamer \
socat \ socat \
htmlhint \ htmlhint \
eslint \ eslint
&& rm -rf /.npm /home/packer \
&& (pacman -Sc --noconfirm || true)
RUN mkdir -p /etc/kvmd/nginx RUN mkdir -p /etc/kvmd/nginx