buck's review

This commit is contained in:
Buck Golemon 2015-08-11 14:31:08 -07:00
parent 737582d78a
commit 47489106e2
6 changed files with 21 additions and 18 deletions

View file

@ -1,10 +1,18 @@
DOCKER_RUN_TEST := docker run -v $(PWD):/mnt:ro
DOCKER_DEB_TEST := sh -c 'apt-get update && \
apt-get install -y --no-install-recommends procps && \
dpkg -i /mnt/dist/*.deb && cd /mnt && ./test'
DOCKER_PYTHON_TEST := sh -c 'apt-get update && \
apt-get install -y --no-install-recommends python-pip build-essential procps && \
pip install /mnt && cd /mnt && ./test'
DOCKER_DEB_TEST := sh -euxc ' \
apt-get update \
&& apt-get install -y --no-install-recommends procps \
&& dpkg -i /mnt/dist/*.deb \
&& cd /mnt \
&& ./test \
'
DOCKER_PYTHON_TEST := sh -uexc ' \
apt-get update \
&& apt-get install -y --no-install-recommends python-pip build-essential procps \
&& pip install -vv /mnt \
&& cd /mnt \
&& ./test \
'
.PHONY: build
build:
@ -44,17 +52,11 @@ install-hooks:
itest: itest_lucid itest_precise itest_trusty itest_wheezy itest_jessie itest_stretch
itest_lucid: _itest-ubuntu-lucid
@true
itest_precise: _itest-ubuntu-precise
@true
itest_trusty: _itest-ubuntu-trusty
@true
itest_wheezy: _itest-debian-wheezy
@true
itest_jessie: _itest-debian-jessie
@true
itest_stretch: _itest-debian-stretch
@true
_itest-%: _itest_deb-% _itest_python-%
@true

2
test
View file

@ -1,4 +1,4 @@
#!/bin/sh -eu
#!/bin/bash -eux
if [ "$#" -eq 1 ]; then
dumb_init_bin=$(readlink -f "$1")
else

View file

@ -1,4 +1,4 @@
#!/bin/sh -eu
#!/bin/bash -eux
# Print received signals into a file, one per line
file="$1"
@ -10,5 +10,6 @@ done
echo 'ready' > "$file"
# loop forever
echo 'loop forever...'
set +x
while :; do true; done

View file

@ -1,4 +1,4 @@
#!/bin/sh -u
#!/bin/bash -eux
dumb_init="$1"
# dumb-init should exit with the same exit status as the process it launches.

View file

@ -1,4 +1,4 @@
#!/bin/sh -u
#!/bin/bash -eux
# dumb-init should say something useful when called with no arguments, and exit
# nonzero.

View file

@ -1,4 +1,4 @@
#!/bin/sh -eum
#!/bin/bash -euxm
# dumb-init should proxy all possible signals to the child process.
dumb_init="$1"