NeonXP/dumb-init
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix some dependency issues in testing/building

Browse source
This commit is contained in:
Chris Kuehl 2015-09-09 19:04:28 -07:00 committed by Kent Wills
parent d5f0be96d3
commit 9083e1e2d3
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -3,8 +3,8 @@ FROM debian:jessie
MAINTAINER Chris Kuehl <ckuehl@yelp.com>
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
apt-get install -y --no-install-recommends \
build-essential devscripts equivs procps python psmisc libpcre3 && \
build-essential devscripts equivs && \
apt-get clean
WORKDIR /mnt
ENTRYPOINT mk-build-deps -i && make builddeb
ENTRYPOINT mk-build-deps -i --tool 'apt-get --no-install-recommends -y' && make builddeb

6
Makefile
View file

@ -1,9 +1,11 @@
CFLAGS=-std=gnu99 -static -Wall -Werror
TEST_PACKAGE_DEPS := python procps psmisc libpcre3
DOCKER_RUN_TEST := docker run -v $(PWD):/mnt:ro
DOCKER_DEB_TEST := sh -euxc ' \
apt-get update \
&& apt-get install -y --no-install-recommends python procps psmisc libpcre3 \
&& apt-get install -y --no-install-recommends $(TEST_PACKAGE_DEPS) \
&& (which timeout || apt-get install -y --no-install-recommends timeout) \
&& dpkg -i /mnt/dist/*.deb \
&& cd /mnt \
@ -11,7 +13,7 @@ DOCKER_DEB_TEST := sh -euxc ' \
'
DOCKER_PYTHON_TEST := sh -uexc ' \
apt-get update \
&& apt-get install -y --no-install-recommends python python-pip build-essential procps psmisc libpcre3 \
&& apt-get install -y --no-install-recommends python-pip build-essential $(TEST_PACKAGE_DEPS) \
&& (which timeout || apt-get install -y --no-install-recommends timeout) \
&& tmp=$$(mktemp -d) \
&& cp -r /mnt/* "$$tmp" \

3
debian/control vendored
View file

@ -3,7 +3,8 @@ Section: utils
Priority: extra
Maintainer: Chris Kuehl <ckuehl@yelp.com>
Uploaders: Kent Wills <rkwills@yelp.com>
Build-Depends: debhelper (>= 7), gcc, fakeroot, procps
Build-Depends: debhelper (>= 7), gcc, fakeroot, procps, psmisc, libpcre3,
python
Standards-Version: 3.9.6
Package: dumb-init