Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Let Docker handle signals #806

Merged
merged 3 commits into from
Mar 3, 2021
Merged

Let Docker handle signals #806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63a6a6e
Use tini in docker as PID1 to enable signal handling.
Mar 3, 2021
bb80140
update release process bits for language server and git tagging.
Mar 3, 2021
8ff9b22
Update changelog
Mar 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
* Add the `kafka` onramp config `retry_failed_events` to acoid retrying failed events, and `polling_interval` to control how often kafka is polled for new messages if none were available previously [#779](https://github.com/tremor-rs/tremor-runtime/pull/779)
* Add `kv` connector with the supported operations `put`, `get`, `delete`, `scan`, `cas`.
* Add discord badge to README.md.
* Handle signals and terminate properly on Ctrl+C in docker [#806](https://github.com/tremor-rs/tremor-runtime/pull/806)

### Fixes

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ FROM debian:buster-slim
RUN useradd -ms /bin/bash tremor

RUN apt-get update \
&& apt-get install -y libssl1.1 libcurl4 libatomic1 \
&& apt-get install -y libssl1.1 libcurl4 libatomic1 tini \
#
# Clean up
&& apt-get autoremove -y \
Expand All @@ -65,4 +65,4 @@ COPY docker/logger.yaml /etc/tremor/logger.yaml

ENV TREMOR_PATH=/opt/local/tremor/lib

ENTRYPOINT ["/entrypoint.sh"]
ENTRYPOINT ["tini", "/entrypoint.sh"]
5 changes: 4 additions & 1 deletion RELEASE_PROCESS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* Update tests in tremor-cli/tests/ that match against the current version number
* Create a PR with those changes
* Pull the PR once accepted and merged
* `git tag -a -m"Release v<MAJOR>.<MINOR>.<BUGFIX>" <COMMIT>`
* `git tag -a -m"Release v<MAJOR>.<MINOR>.<BUGFIX>" v<MAJOR>.<MINOR>.<BUGFIX> <COMMIT>`
* `git push origin --tag`
* Draft a new release on github
- This will trigger the docker image build jobs
Expand All @@ -30,6 +30,9 @@
- ./tremor-script
* Release https://github.com/tremor-rs/tremor-language-server
- Bump version and update dependency `tremor-script` to the new version.
- Create a github tag and draft a release from it:
- `git tag -a -m"Release v<MAJOR>.<MINOR>.<BUGFIX>" v<MAJOR>.<MINOR>.<BUGFIX> <COMMIT>`
- `git push origin --tag`
- Execute `cargo publish` from the language server repository root.
- Verify new language server installation via `cargo install tremor-language-server`
* Wait for the docker image to build and publish
Expand Down