summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevaev Maxim <[email protected]>2019-08-23 12:29:04 +0300
committerDevaev Maxim <[email protected]>2019-08-23 12:29:04 +0300
commit47d7e4f2343b71426d32c4c9b45010cf60d5a5a9 (patch)
tree073846ef512ab14a004a6751508f67e46197279b
parent692dbcac118041afbea6562b8e52ba33ce2f0a66 (diff)
don't use packer-kit
-rw-r--r--testenv/Dockerfile45
1 files changed, 22 insertions, 23 deletions
diff --git a/testenv/Dockerfile b/testenv/Dockerfile
index 29e573ec..8319d385 100644
--- a/testenv/Dockerfile
+++ b/testenv/Dockerfile
@@ -2,40 +2,39 @@ FROM archlinux/base
RUN dd if=/dev/zero of=/root/loop.img bs=1024 count=1048576
+RUN echo "Server = http://mirror.yandex.ru/archlinux/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist
+
RUN pacman -Syu --noconfirm \
&& pacman -S --needed --noconfirm \
base \
base-devel \
+ vim \
git \
- expac \
- jshon \
+ libjpeg \
+ libevent \
+ libutil-linux \
+ python \
+ python-pip \
+ python-tox \
+ python-systemd \
+ python-dbus \
+ python-mako \
+ nginx-mainline \
+ socat \
+ eslint \
+ npm \
&& (pacman -Sc --noconfirm || true)
-RUN useradd -r -c "Packer build user" -m -d /var/packer -s /sbin/nologin packer \
- && cd /tmp \
- && sudo -u packer git clone https://github.com/pi-kvm/packer-kit.git \
- && cd packer-kit \
- && sudo -u packer makepkg \
- && pacman --noconfirm -U packer-kit-*.pkg.tar.xz \
- && cd - \
- && rm -rf /tmp/packer-kit
-
-RUN pkg-install -S \
- python \
- python-pip \
- python-tox \
- python-systemd \
- python-dbus \
- python-mako \
- nginx-mainline \
- socat \
- htmlhint \
- eslint
+RUN npm install htmlhint -g
ARG USTREAMER_MIN_VERSION
ENV USTREAMER_MIN_VERSION $USTREAMER_MIN_VERSION
RUN echo $USTREAMER_MIN_VERSION
-RUN pkg-install -S ustreamer
+RUN git clone https://github.com/pi-kvm/ustreamer \
+ && cd ustreamer \
+ && make PREFIX=/usr install \
+ && cd - \
+ && rm -rf ustreamer
COPY testenv/requirements.txt requirements.txt
RUN pip install -r requirements.txt