Install psmisc for itests (needed for pstree)
This commit is contained in:
parent
497b7d0fcc
commit
6dc426613f
2 changed files with 3 additions and 3 deletions
|
@ -3,7 +3,7 @@ FROM debian:jessie
|
||||||
MAINTAINER Chris Kuehl <ckuehl@yelp.com>
|
MAINTAINER Chris Kuehl <ckuehl@yelp.com>
|
||||||
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
|
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
build-essential devscripts equivs && \
|
build-essential devscripts equivs procps psmisc && \
|
||||||
apt-get clean
|
apt-get clean
|
||||||
WORKDIR /mnt
|
WORKDIR /mnt
|
||||||
|
|
||||||
|
|
4
Makefile
4
Makefile
|
@ -3,7 +3,7 @@ CFLAGS=-std=gnu99 -static -Wall -Werror
|
||||||
DOCKER_RUN_TEST := docker run -v $(PWD):/mnt:ro
|
DOCKER_RUN_TEST := docker run -v $(PWD):/mnt:ro
|
||||||
DOCKER_DEB_TEST := sh -euxc ' \
|
DOCKER_DEB_TEST := sh -euxc ' \
|
||||||
apt-get update \
|
apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends procps \
|
&& apt-get install -y --no-install-recommends procps psmisc \
|
||||||
&& (which timeout || apt-get install -y --no-install-recommends timeout) \
|
&& (which timeout || apt-get install -y --no-install-recommends timeout) \
|
||||||
&& dpkg -i /mnt/dist/*.deb \
|
&& dpkg -i /mnt/dist/*.deb \
|
||||||
&& cd /mnt \
|
&& cd /mnt \
|
||||||
|
@ -11,7 +11,7 @@ DOCKER_DEB_TEST := sh -euxc ' \
|
||||||
'
|
'
|
||||||
DOCKER_PYTHON_TEST := sh -uexc ' \
|
DOCKER_PYTHON_TEST := sh -uexc ' \
|
||||||
apt-get update \
|
apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends python-pip build-essential procps \
|
&& apt-get install -y --no-install-recommends python-pip build-essential procps psmisc \
|
||||||
&& (which timeout || apt-get install -y --no-install-recommends timeout) \
|
&& (which timeout || apt-get install -y --no-install-recommends timeout) \
|
||||||
&& tmp=$$(mktemp -d) \
|
&& tmp=$$(mktemp -d) \
|
||||||
&& cp -r /mnt/* "$$tmp" \
|
&& cp -r /mnt/* "$$tmp" \
|
||||||
|
|
Loading…
Reference in a new issue