summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authorDevaev Maxim <[email protected]>2018-09-06 04:33:05 +0300
committerDevaev Maxim <[email protected]>2018-09-06 04:33:05 +0300
commit87e3b96a901e583f90432c07f64d303ae2e6bd05 (patch)
tree7671ce685d218205b77669a988758eb7ed2e7b5d /os
parent02b7e5b1c235f23a343f01a9e8b2d0f07787f17e (diff)
fixed broken aur nginx lua module
Diffstat (limited to 'os')
-rw-r--r--os/platforms/v1/Dockerfile.part8
-rw-r--r--os/platforms/v1/customizepkg.nginx1
2 files changed, 7 insertions, 2 deletions
diff --git a/os/platforms/v1/Dockerfile.part b/os/platforms/v1/Dockerfile.part
index 6c25d07e..2c6b1557 100644
--- a/os/platforms/v1/Dockerfile.part
+++ b/os/platforms/v1/Dockerfile.part
@@ -1,12 +1,16 @@
RUN pkg-install \
nginx-mainline \
- nginx-mainline-mod-lua \
apache-tools \
mjpg-streamer \
python \
- python-raspberry-gpio
+ python-raspberry-gpio \
+ customizepkg
RUN systemctl enable nginx
+COPY stages/pikvm/customizepkg.nginx /etc/customizepkg.d/nginx-mainline-mod-ndk
+COPY stages/pikvm/customizepkg.nginx /etc/customizepkg.d/nginx-mainline-mod-lua
+RUN env MAKEPKGOPTS="--skipchecksums --skippgpcheck" pkg-install nginx-mainline-mod-lua
+
ARG KVMD_VERSION
ENV KVMD_VERSION $KVMD_VERSION
RUN echo $KVMD_VERSION
diff --git a/os/platforms/v1/customizepkg.nginx b/os/platforms/v1/customizepkg.nginx
new file mode 100644
index 00000000..5e7db5a4
--- /dev/null
+++ b/os/platforms/v1/customizepkg.nginx
@@ -0,0 +1 @@
+replace#global#_nginxver=.*#_nginxver=`pacman -Q nginx-mainline | grep -Po "\\d+\\.\\d+\\.\\d+"`