diff options
| author | Devaev Maxim <[email protected]> | 2018-12-15 04:29:40 +0300 |
|---|---|---|
| committer | Devaev Maxim <[email protected]> | 2018-12-15 04:29:40 +0300 |
| commit | 3c33bd37190772a783369894e209bcfe0858177a (patch) | |
| tree | e095f08f37371a3182f6ced0b280c4bcaa06983b /testenv | |
| parent | 3445766a50eab16a96d969397a6fe0422f7cfcd2 (diff) | |
own auth
Diffstat (limited to 'testenv')
| -rw-r--r-- | testenv/Dockerfile | 6 | ||||
| -rw-r--r-- | testenv/customizepkg.nginx | 1 | ||||
| -rw-r--r-- | testenv/kvmd.yaml | 3 | ||||
| -rw-r--r-- | testenv/requirements.txt | 1 | ||||
| -rw-r--r-- | testenv/tox.ini | 2 |
5 files changed, 5 insertions, 8 deletions
diff --git a/testenv/Dockerfile b/testenv/Dockerfile index 78226b17..4fe453e8 100644 --- a/testenv/Dockerfile +++ b/testenv/Dockerfile @@ -31,12 +31,7 @@ RUN useradd -r -d / packer \ && cd - \ && rm -rf /tmp/packer-color -COPY testenv/customizepkg.nginx /etc/customizepkg.d/nginx-mainline-mod-ndk -COPY testenv/customizepkg.nginx /etc/customizepkg.d/nginx-mainline-mod-lua - RUN pacman -Syy \ - && user-packer -S --noconfirm \ - customizepkg \ && mkdir /.npm \ && chmod 777 /.npm \ && user-packer -S --noconfirm \ @@ -50,7 +45,6 @@ RUN pacman -Syy \ htmlhint \ eslint \ && rm -rf /.npm \ - && env MAKEPKGOPTS="--skipchecksums --skippgpcheck" user-packer -S --noconfirm nginx-mainline-mod-lua \ && pacman -Sc --noconfirm COPY testenv/requirements.txt requirements.txt diff --git a/testenv/customizepkg.nginx b/testenv/customizepkg.nginx deleted file mode 100644 index 5e7db5a4..00000000 --- a/testenv/customizepkg.nginx +++ /dev/null @@ -1 +0,0 @@ -replace#global#_nginxver=.*#_nginxver=`pacman -Q nginx-mainline | grep -Po "\\d+\\.\\d+\\.\\d+"` diff --git a/testenv/kvmd.yaml b/testenv/kvmd.yaml index 8233cd58..da37e9d8 100644 --- a/testenv/kvmd.yaml +++ b/testenv/kvmd.yaml @@ -4,6 +4,9 @@ kvmd: port: 8081 heartbeat: 3.0 + auth: + htpasswd: /etc/kvmd/htpasswd + info: meta: /etc/kvmd/meta.yaml extras: /usr/share/kvmd/extras diff --git a/testenv/requirements.txt b/testenv/requirements.txt index 4f95d90a..a968fcb1 100644 --- a/testenv/requirements.txt +++ b/testenv/requirements.txt @@ -1,6 +1,7 @@ git+git://github.com/willbuckner/rpi-gpio-development-mock@master#egg=rpi aiohttp aiofiles +passlib pyudev pyyaml pyserial diff --git a/testenv/tox.ini b/testenv/tox.ini index 47ce1636..b10700a2 100644 --- a/testenv/tox.ini +++ b/testenv/tox.ini @@ -33,7 +33,7 @@ deps = [testenv:eslint] whitelist_externals = eslint -commands = eslint --config=testenv/eslintrc.yaml --color --ext .js web/js +commands = eslint --config=testenv/eslintrc.yaml --color --ext .js web/share/js [testenv:htmlhint] whitelist_externals = htmlhint |