Skip to content

Commit

Permalink
Merge pull request #491 from gliderlabs/master
Browse files Browse the repository at this point in the history
release 3.2.12
  • Loading branch information
michaelshobbs authored Oct 22, 2020
2 parents 80b0f24 + 8bd8ae9 commit fdc00f0
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
11 changes: 8 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ All notable changes to this project will be documented in this file.

### Changed

## [v3.2.11] - 2020-05-8
## [v3.2.12] - 2020-10-22
### Changed
- @michaelshobbs bump alpine to 3.12

## [v3.2.11] - 2020-05-08
### Added
- @hhromic Add Syslog TCP framing documentation to README

Expand All @@ -19,7 +23,7 @@ All notable changes to this project will be documented in this file.
- @michaelshobbs use type assertion instead of reflection to determine connection type
- @michaelshobbs use // + space for all human readable comments

## [v3.2.10] - 2020-05-1
## [v3.2.10] - 2020-05-01
### Added
- @jszwedko Add optional TCP framing to syslog adapter

Expand Down Expand Up @@ -243,7 +247,8 @@ All notable changes to this project will be documented in this file.
- Base container is now Alpine
- Moved to gliderlabs organization

[unreleased]: https://github.com/gliderlabs/logspout/compare/v3.2.11...HEAD
[unreleased]: https://github.com/gliderlabs/logspout/compare/v3.2.12...HEAD
[v3.2.12]: https://github.com/gliderlabs/logspout/compare/v3.2.11...v3.2.12
[v3.2.11]: https://github.com/gliderlabs/logspout/compare/v3.2.10...v3.2.11
[v3.2.10]: https://github.com/gliderlabs/logspout/compare/v3.2.9...v3.2.10
[v3.2.9]: https://github.com/gliderlabs/logspout/compare/v3.2.8...v3.2.9
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.12
ENTRYPOINT ["/bin/logspout"]
VOLUME /mnt/routes
EXPOSE 80
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.12
VOLUME /mnt/routes
EXPOSE 80

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v3.2.11
v3.2.12

0 comments on commit fdc00f0

Please sign in to comment.