summaryrefslogtreecommitdiff
path: root/testenv
diff options
context:
space:
mode:
authorDevaev Maxim <[email protected]>2019-04-13 22:06:28 +0300
committerDevaev Maxim <[email protected]>2019-04-13 22:06:28 +0300
commitcb56aeea0a46ac4d7588593ba5bb1f9f725e548c (patch)
tree4deaa87b0fe9c0ebb28ae14f1af90a3f6af66de3 /testenv
parent4353735e93bce964a6751cdafee3eac5b40dc5c8 (diff)
build fixes
Diffstat (limited to 'testenv')
-rw-r--r--testenv/Dockerfile31
1 files changed, 13 insertions, 18 deletions
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