Skip to content

Commit

Permalink
Merge pull request #407 from rockandska/use_tini_in_docker
Browse files Browse the repository at this point in the history
[docker] use tini as entrypoint
  • Loading branch information
martin-schulze-vireso committed Apr 9, 2021
2 parents 9441d7f + 78e1677 commit 4682841
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 5 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
ARG bashver=latest

FROM bash:${bashver}
ARG TINI_VERSION=v0.19.0

RUN wget https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static-amd64 -O /tini && \
chmod +x /tini

# Install parallel and accept the citation notice (we aren't using this in a
# context where it make sense to cite GNU Parallel).
Expand All @@ -12,4 +16,4 @@ COPY . /opt/bats/

WORKDIR /code/

ENTRYPOINT ["bash", "bats"]
ENTRYPOINT ["/tini", "--", "bash", "bats"]
2 changes: 2 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ The format is based on [Keep a Changelog][kac] and this project adheres to
### Changed

* added checks and improved documentation for `$BATS_TMPDIR` (#410)
* the docker container now uses [tini](https://github.com/krallin/tini) as the container entrypoint to
improve signal forwarding (#407)

### Fixed

Expand Down

0 comments on commit 4682841

Please sign in to comment.