updated docker image

This commit is contained in:
Devaev Maxim 2019-04-13 07:57:02 +03:00
parent 0c82937d3c
commit 38445f2a95

View File

@ -3,7 +3,7 @@ FROM archlinux/base
RUN dd if=/dev/zero of=/root/loop.img bs=1024 count=1048576 RUN dd if=/dev/zero of=/root/loop.img bs=1024 count=1048576
RUN pacman -Syu --noconfirm \ RUN pacman -Syu --noconfirm \
&& pacman -S --noconfirm \ && pacman -S --needed --noconfirm \
base \ base \
base-devel \ base-devel \
git \ git \
@ -11,25 +11,19 @@ RUN pacman -Syu --noconfirm \
jshon \ jshon \
&& (pacman -Sc --noconfirm || true) && (pacman -Sc --noconfirm || true)
RUN useradd -r -d / packer \ RUN useradd -r -c "Packer build user" -s /sbin/nologin packer \
&& cd /tmp \ && cd /tmp \
&& sudo -u packer git clone https://aur.archlinux.org/packer-color.git \ && sudo -u packer git clone https://aur.archlinux.org/packer-kit.git \
&& cd packer-color \ && cd packer-kit \
&& sudo -u packer makepkg \ && sudo -u packer makepkg \
&& pacman --noconfirm -U packer-color-*.pkg.tar.xz \ && pacman --noconfirm -U packer-kit-*.pkg.tar.xz \
&& ln -s /usr/bin/packer-color /usr/local/bin/packer \
&& cp /usr/bin/packer-color /usr/local/bin/user-packer \
&& sed -i -e "s|makepkg \$MAKEPKGOPTS |chown -R packer:packer \$dir; makepkg \$MAKEPKGOPTS |g" \
/usr/local/bin/user-packer \
&& sed -i -e "s|makepkg \$MAKEPKGOPTS --asroot -f|sudo -u packer makepkg \$MAKEPKGOPTS -f|g" \
/usr/local/bin/user-packer \
&& cd - \ && cd - \
&& rm -rf /tmp/packer-color && rm -rf /tmp/packer-kit
RUN pacman -Syy \ RUN pacman -Syy \
&& mkdir /.npm \ && mkdir /.npm /home/packer \
&& chmod 777 /.npm \ && chmod 777 /.npm /home/packer \
&& user-packer -S --noconfirm \ && packer-user -S --needed --noconfirm \
python \ python \
python-pip \ python-pip \
python-tox \ python-tox \
@ -41,7 +35,7 @@ RUN pacman -Syy \
socat \ socat \
htmlhint \ htmlhint \
eslint \ eslint \
&& rm -rf /.npm \ && rm -rf /.npm /home/packer \
&& (pacman -Sc --noconfirm || true) && (pacman -Sc --noconfirm || true)
RUN mkdir -p /etc/kvmd/nginx RUN mkdir -p /etc/kvmd/nginx