Commit Graph

154 Commits

Author SHA1 Message Date
Thomas Orozco c88c1f4ea4 Update outer tests to support MINIMAL 2016-11-04 18:06:25 +01:00
Thomas Orozco b67a024460 Rename NO_ARGS to MINIMAL 2016-11-04 18:06:25 +01:00
Thomas Orozco a60521a432 Add @crosbymichael to contributors 2016-11-04 13:31:19 +01:00
Michael Crosby 51df7df854 Handle execve exit status
This changes the execve exit status for the child process to be inline
with standard exit status codes for common execve failures.

I don't think this breaks any backwards compat with existing tini users
because it is still returning a non zero exit status but with correct
codes providing more information why it failed.
2016-11-04 13:25:14 +01:00
Thomas Orozco b3a2ba638e NO_ARGS: White labelling
- Don't mention options that don't exist in Usage.
- Don't include a log prefix when NO_ARGS is set.
- Turn up the default verbosity to FATAL when NO_ARGS is set.
- Expose verbosity via an ENV var for debugging.
2016-11-04 13:22:41 +01:00
Thomas Orozco a88563ec34 Merge pull request #58 from krallin/version-flag
Add a --version flag
2016-11-03 22:49:40 +01:00
Thomas Orozco 99b7ab7004 Bump version to 0.12.0 2016-11-03 22:38:02 +01:00
Thomas Orozco c9ff1b6917 Add a --version flag
See: https://github.com/krallin/tini/issues/55
2016-11-03 19:32:59 +01:00
Thomas Orozco 9c00aea006 Merge pull request #57 from krallin/sync-readme
[ci skip] 0.11.0: Sync README
2016-11-02 22:41:49 +01:00
Thomas Orozco 082c13d48e [ci skip] 0.11.0: Sync README 2016-11-02 22:40:54 +01:00
Thomas Orozco 9e617e76d7 Merge pull request #56 from krallin/release-0.11.0
Release 0.11.0
2016-11-02 22:15:55 +01:00
Thomas Orozco be920296b9 Bump version to 0.11.0 2016-11-02 21:59:24 +01:00
Thomas Orozco 2484f1a951 Reaping test: remove no sleep assumption
The reaping test assumes that all the `sleep` processes on the system
are created by us, which is an incorrect assumption, and creates
problems now that we run in a more "complete" system in CI (i.e. not in
a minimal container).

This solves the issue by not assuming that random sleep processes are
related to us: instead, we look at whether these processes are in our
process group.

This also includes a little clean up of the reaping stage 1.
2016-11-02 21:55:19 +01:00
Thomas Orozco 7c9d3b39a9 .travis.yml does not need to be a template anymore 2016-11-02 21:28:20 +01:00
Thomas Orozco 480fed14ae Optionally disable arg parsing (-DNO_ARGS=ON) 2016-11-02 18:05:12 +01:00
Thomas Orozco fa597944fa Log reaping test failures 2016-11-02 17:43:03 +01:00
Thomas Orozco 271c09796e Update README to mention ARM images 2016-10-30 15:55:56 +01:00
Thomas Orozco 6131b96251 Skip packages on ARM
Right now, the packages are hard-coded to report the amd64 architecture.
I'm not sure they'll be used or needed, so for now let's ignore and skip
them.
2016-10-30 15:55:56 +01:00
Thomas Orozco c8cc8274b8 ARM Cross Builds
- Upgrade to Trusty for the ARM 64 toolchain.
- Cross-compile to ARM.
- Label binaries and packages when releasing.
2016-10-30 15:55:56 +01:00
Jorge Marin df9dbc1055 Replace GPG key short id for full fingerprint (#48)
Prevent dead beef attack
2016-09-01 19:31:55 +02:00
Thomas Orozco b4824de6ca Merge pull request #47 from krallin/add-license-option
Add license option
2016-08-12 18:46:02 -04:00
Thomas Orozco 75217ef640 Bump version to 0.10.0
- New `-l` option to show license and exit.
2016-08-12 18:43:08 -04:00
Thomas Orozco 203835d2a6 Remove obsolete comment
tini -h does exit with 0 via `parse_fail_exitcode_ptr`.
2016-08-10 08:52:20 +02:00
Thomas Orozco be71d120e7 Embed license and add -l flag to show it
This adds 1k of weight to the resulting binary, which is reasonable
(it's less than 5% for the smaller non-static binary), but alleviates
legitimate user concern that the license requires being included when
Tini is redistributed.
2016-08-10 08:50:47 +02:00
Thomas Orozco 2eeac4cd60 Don't attempt to sign without GPG_PASSPHRASE
This ensures PRs can build even though GPG_PASSPHRASE is missing.
2016-08-10 08:49:56 +02:00
Thomas Orozco 24969266fc Merge pull request #40 from krallin/new-alpine-instructions
[ci skip] Update Alpine instructions
2016-06-03 19:35:40 +02:00
Thomas Orozco a61a036c6e [ci skip] Update Alpine instructions 2016-06-03 19:34:45 +02:00
Thomas Orozco 90a9494622 Merge pull request #39 from rprieto/patch-1
Update README to point to Alpine CDN repository
2016-04-19 22:42:43 +02:00
Romain 55e927779a Update README to point to Alpine CDN repository
I ran into trouble installing `tini` from http://dl-1.alpinelinux.org/alpine/edge/community/

```bash
WARNING: Ignoring APKINDEX.83d1b7a5.tar.gz: No such file or directory
ERROR: unsatisfiable constraints:
  tini (missing):
    required by: world[tini]
The command '/bin/sh -c apk add --repository http://dl-1.alpinelinux.org/alpine/edge/community/ tini' returned a non-zero code: 1
```

Updating to http://dl-1.alpinelinux.org/alpine/edge/community/ seems to fix it. Not sure if that's the right way but it worked me me.
2016-04-19 14:00:43 +10:00
Thomas Orozco 553307341d Merge pull request #34 from danilobuerger/master
Moved alpine package to community repository
2016-02-09 18:46:03 +01:00
Danilo Bürger d5d6e0ee94 Moved alpine package to community repository 2016-02-05 21:59:40 +01:00
Thomas Orozco 9451d6cf50 Merge pull request #33 from krallin/signed-binaries
Sign `tini` and `tini-static` binaries
2016-01-26 22:08:24 -05:00
Thomas Orozco 2c2bb517b0 Bump version to 0.9.0 2016-01-26 22:05:00 -05:00
Thomas Orozco 551d271823 Document signed binaries 2016-01-26 21:56:43 -05:00
Thomas Orozco 44b5675f0e Sign `tini` and `tini-static` binaries
The GPG signing subkey and passphrase are respectively provided through
a Travis encrypted file and a Travis encrypted environment variable.

Signing is only done if there is a signing key present when the build is
complete (so as to not fail when e.g. building a PR that doesn't have
encrypted files available).
2016-01-26 21:56:43 -05:00
Thomas Orozco 428d960140 Merge pull request #26 from krallin/readme-updates
Readme updates
2015-11-20 22:35:05 +01:00
Thomas Orozco a4af09f931 Do a better job at acknowledging contributors
Thanks to @tianon, @dpw, @danilobuerger, @datakurre!
2015-11-20 22:31:08 +01:00
Thomas Orozco b62b57caeb There appears to be a Nix package now!
https://github.com/NixOS/nixpkgs/pull/10945
2015-11-20 22:30:00 +01:00
Thomas Orozco dc261b386e Merge pull request #25 from krallin/specific-git-dir
Build: ensure the correct git directory is used
2015-11-20 22:24:13 +01:00
Thomas Orozco eb094de175 Release 0.8.4 2015-11-20 21:48:02 +01:00
Thomas Orozco ce73bd258f Build: ensure the correct git directory is used
If Tini is built without its own .git directory, but within another
git directory (i.e. the tarball was extracted in a directory
that happens to be a git tree), then we end up with the wrong
git version in `tini -h`.

This actually happens in the Alpine builds (e.g. Tini 0.8.3 in
Alpine has git hash d89e144, which is a Aports commit hash, not
a Tini commit hash:

https://github.com/alpinelinux/aports/commit/d89e144

This patch forces git to use the current git directory, or to not
use one at all (which is fine, since in that case Tini is
presumably being built from a release tarball).
2015-11-20 21:48:02 +01:00
Thomas Orozco 54236e3815 Merge pull request #24 from krallin/test-fortify-source
Add tests for hardening in CI script
2015-11-05 11:25:25 +01:00
Thomas Orozco 2b5b0ecb6e Add tests for hardening in CI script
This ensures that _FORTIFY_SOURCE is actually used!
2015-11-05 11:19:36 +01:00
Thomas Orozco 50476d0cde Merge pull request #23 from krallin/fix-22
Fix 22
2015-11-04 14:01:54 +01:00
Thomas Orozco 9d12e39c9d Release 0.8.3 2015-11-04 13:59:26 +01:00
Thomas Orozco ad11e868f0 Only define _FORTIFY_SOURCE if not built-in
Some platforms (Alpine Linux being one) define _FORTIFY_SOURCE
as a built-in. Redefining it causes a compilation error since we
treat warnings as errors.

Fixes: #22
2015-11-03 16:29:00 +01:00
Thomas Orozco 955d4a0a94 Merge pull request #21 from krallin/fix-19-pass-tty
Pass tty to child process group and release 0.8.2
2015-10-31 15:40:31 +01:00
Thomas Orozco 9bfb4a505f Release 0.8.2
Oops; Travis doesn't like seeing a release commit being rebased.
2015-10-31 15:37:56 +01:00
Thomas Orozco 486f79fe8a Release 0.8.1 2015-10-31 15:31:58 +01:00
Thomas Orozco cd23c4ce65 CFLAGS: throw errors on all warnings 2015-10-31 15:31:58 +01:00