mirror of https://github.com/krallin/tini.git
Refactor build process
This commit is contained in:
parent
d67289b212
commit
04119b2869
|
@ -1,2 +1 @@
|
||||||
tini.o
|
dist
|
||||||
tini
|
|
||||||
|
|
4
Makefile
4
Makefile
|
@ -10,10 +10,6 @@ $(BIN): $(OBJ)
|
||||||
|
|
||||||
$(OBJ):
|
$(OBJ):
|
||||||
|
|
||||||
check:
|
|
||||||
docker build -t tini .
|
|
||||||
python test/test.py
|
|
||||||
|
|
||||||
install: all
|
install: all
|
||||||
mkdir -p $(DESTDIR)$(PREFIX)/bin
|
mkdir -p $(DESTDIR)$(PREFIX)/bin
|
||||||
cp -f $(BIN) $(DESTDIR)$(PREFIX)/bin
|
cp -f $(BIN) $(DESTDIR)$(PREFIX)/bin
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
#!/bin/bash
|
||||||
|
set -o errexit
|
||||||
|
set -o nounset
|
||||||
|
|
||||||
|
REL_HERE=$(dirname "${BASH_SOURCE}")
|
||||||
|
HERE=$(cd "${REL_HERE}"; pwd)
|
||||||
|
|
||||||
|
DIST_DIR="${HERE}/dist"
|
||||||
|
rm -rf "${DIST_DIR}"
|
||||||
|
|
||||||
|
IMG="tini"
|
||||||
|
NAME="${IMG}-dist"
|
||||||
|
BIN="tini"
|
||||||
|
|
||||||
|
docker build -t "${IMG}" .
|
||||||
|
|
||||||
|
docker run -it --name="${NAME}" --entrypoint="bash" --workdir="/tini" "${IMG}" "-c" "make clean && make"
|
||||||
|
docker cp "${NAME}:/tini/${BIN}" "${DIST_DIR}"
|
||||||
|
docker rm "${NAME}"
|
|
@ -0,0 +1,9 @@
|
||||||
|
#!/bin/bash
|
||||||
|
set -o errexit
|
||||||
|
set -o nounset
|
||||||
|
|
||||||
|
IMG="tini"
|
||||||
|
|
||||||
|
|
||||||
|
docker build -t "${IMG}" .
|
||||||
|
python test/test.py "${IMG}"
|
11
test/test.py
11
test/test.py
|
@ -55,6 +55,9 @@ class Command(object):
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
img = sys.argv[1]
|
||||||
|
name = "{0}-test".format(img)
|
||||||
|
|
||||||
root = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
|
root = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
|
||||||
|
|
||||||
# Tests rely on exiting fast enough (exiting at all, in fact).
|
# Tests rely on exiting fast enough (exiting at all, in fact).
|
||||||
|
@ -62,12 +65,12 @@ if __name__ == "__main__":
|
||||||
"docker",
|
"docker",
|
||||||
"run",
|
"run",
|
||||||
"--rm",
|
"--rm",
|
||||||
"--name=tini-test",
|
"--name={0}".format(name),
|
||||||
"tini",
|
img,
|
||||||
"-vvvv",
|
"-vvvv",
|
||||||
]
|
]
|
||||||
|
|
||||||
fail_cmd = ["docker", "kill", "tini-test"]
|
fail_cmd = ["docker", "kill", name]
|
||||||
|
|
||||||
# Reaping test
|
# Reaping test
|
||||||
Command(base_cmd + ["/tini/test/reaping/stage_1.py"], fail_cmd).run(timeout=10)
|
Command(base_cmd + ["/tini/test/reaping/stage_1.py"], fail_cmd).run(timeout=10)
|
||||||
|
@ -77,7 +80,7 @@ if __name__ == "__main__":
|
||||||
Command(
|
Command(
|
||||||
base_cmd + ["--", "/tini/test/signals/test.py"],
|
base_cmd + ["--", "/tini/test/signals/test.py"],
|
||||||
fail_cmd,
|
fail_cmd,
|
||||||
["docker", "kill", "-s", sig, "tini-test"],
|
["docker", "kill", "-s", sig, name],
|
||||||
2
|
2
|
||||||
).run(timeout=10, retcode=retcode)
|
).run(timeout=10, retcode=retcode)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue