Skip to content

Commit

Permalink
Merge pull request #449 from travis-ci/meat-release-prep
Browse files Browse the repository at this point in the history
Prepare for v3.7.0 release
  • Loading branch information
meatballhat authored Apr 17, 2018
2 parents 29d1281 + 275efb0 commit ef8bf77
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 6 deletions.
15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).

### Security

## [3.7.0] - 2018-04-17

### Added
- logging/metrics: include more fields, alter values in various log entries
- packaging: add systemd service and wrapper script as expected by
[`tfw`](https://github.com/travis-ci/tfw).

### Changed
- backend: handle "map string" config values delimited by either spaces or
commas, with potentially URL-encoded parts
- config: change default dist to `trusty`

## [3.6.0] - 2018-03-02

### Added
Expand Down Expand Up @@ -655,7 +667,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
### Added
- Initial release

[Unreleased]: https://github.com/travis-ci/worker/compare/v3.6.0...HEAD
[Unreleased]: https://github.com/travis-ci/worker/compare/v3.7.0...HEAD
[3.7.0]: https://github.com/travis-ci/worker/compare/v3.6.0...v3.7.0
[3.6.0]: https://github.com/travis-ci/worker/compare/v3.5.0...v3.6.0
[3.5.0]: https://github.com/travis-ci/worker/compare/v3.4.0...v3.5.0
[3.4.0]: https://github.com/travis-ci/worker/compare/v3.3.1...v3.4.0
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright © 2017 Travis CI GmbH
Copyright © 2018 Travis CI GmbH

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -216,4 +216,4 @@ The next step is to create a new [Github release tag](https://github.com/travis-

See [LICENSE file](./LICENSE).

© 2017 Travis CI GmbH
© 2018 Travis CI GmbH
7 changes: 4 additions & 3 deletions script/docker-push
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ main() {

local login_args=(
-u "${DOCKER_LOGIN_USERNAME}"
-p "${DOCKER_LOGIN_PASSWORD}"
--password-stdin
)

if [[ "${DOCKER_LOGIN_EMAIL}" ]]; then
Expand All @@ -37,9 +37,10 @@ main() {

__log 'msg="docker login"'
if [[ "${DOCKER_LOGIN_SERVER}" ]]; then
docker login "${login_args[@]}" "${DOCKER_LOGIN_SERVER}"
echo "${DOCKER_LOGIN_PASSWORD}" |
docker login "${login_args[@]}" "${DOCKER_LOGIN_SERVER}"
else
docker login "${login_args[@]}"
echo "${DOCKER_LOGIN_PASSWORD}" | docker login "${login_args[@]}"
fi

: "${DOCKER_PUSH_RETRIES:=6}"
Expand Down

0 comments on commit ef8bf77

Please sign in to comment.