Merge pull request #513 from gliderlabs/master

release v3.2.14

Author: michaelshobbs

circle.yml renamed to .circleci/config.yml

@@ -4,7 +4,7 @@ jobs:
     machine: true
     working_directory: /home/circleci/logspout
     environment:
-      DEBUG: true
+      DEBUG: "true"
     steps:
       - checkout
       - run: |
@@ -36,3 +36,32 @@ jobs:
             if [ "${CIRCLE_BRANCH}" == "release" ]; then
               make release
             fi
+  publish:
+    machine:
+      image: ubuntu-1604:202007-01
+    working_directory: /home/circleci/logspout
+    environment:
+      DEBUG: "true"
+    steps:
+      - checkout
+      - run: make publish-requirements
+      - run: make publish-test
+      - run: |
+          if [ "${CIRCLE_BRANCH}" == "master" ]; then
+            docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
+            make publish-master
+          fi
+      - run: |
+          if [ "${CIRCLE_BRANCH}" == "release" ]; then
+            docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
+            make publish-release
+          fi
+
+workflows:
+  version: 2
+  build_and_publish:
+    jobs:
+      - build
+      - publish:
+          requires:
+            - build

CHANGELOG.md

@@ -10,6 +10,14 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+## [v3.2.14] - 2021-12-03
+### Fixed
+- @0xflotus fix: typo error in project name
+
+### Changed
+- @skyzh upgrade dockerclient dependency
+- @merowing1279 retrieve logs from already started containers
+- @odidev Release docker image for arm64
 
 ## [v3.2.13] - 2020-11-26
 ### Changed
@@ -255,7 +263,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.13...HEAD
+[unreleased]: https://github.com/gliderlabs/logspout/compare/v3.2.14...HEAD
+[v3.2.14]: https://github.com/gliderlabs/logspout/compare/v3.2.13...v3.2.14
 [v3.2.13]: https://github.com/gliderlabs/logspout/compare/v3.2.12...v3.2.13
 [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

Makefile

@@ -1,5 +1,3 @@
-.PHONY: build
-
 NAME=logspout
 VERSION=$(shell cat VERSION)
 # max image size of 40MB
@@ -110,22 +108,45 @@ test-tls-custom:
 	docker stop $(NAME)-tls-custom || true
 	docker rm $(NAME)-tls-custom || true
 
+.PHONY: release
 release:
 	rm -rf release && mkdir release
 	go get github.com/progrium/gh-release/...
 	cp build/* release
 	gh-release create gliderlabs/$(NAME) $(VERSION) \
 		$(shell git rev-parse --abbrev-ref HEAD) $(VERSION)
 
+.PHONY: circleci
 circleci:
 ifneq ($(CIRCLE_BRANCH), release)
 	echo build-$$CIRCLE_BUILD_NUM > VERSION
 endif
 
+.PHONY: clean
 clean:
 	rm -rf build/
 	docker rm $(shell docker ps -aq) || true
 	docker rmi $(NAME):dev $(NAME):$(VERSION) || true
 	docker rmi $(shell docker images -f 'dangling=true' -q) || true
 
-.PHONY: release clean
+.PHONY: publish-requirements
+publish-requirements:
+	mkdir -vp ~/.docker/cli-plugins/
+	curl --silent -L --output ~/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-amd64
+	chmod a+x ~/.docker/cli-plugins/docker-buildx
+	docker run -it --rm --privileged tonistiigi/binfmt --install all
+	docker buildx create --use --name mybuilder
+
+.PHONY: publish-test
+publish-test:
+	docker buildx build --load --platform linux/amd64 -t gliderlabs/$(NAME):linux-amd64-${CIRCLE_BRANCH} .
+	docker buildx build --load --platform linux/arm64 -t gliderlabs/$(NAME):linux-arm64-${CIRCLE_BRANCH} .
+	docker images
+
+.PHONY: publish-master
+publish-master:
+	docker buildx build --push --platform linux/arm64,linux/amd64 -t gliderlabs/$(NAME):master -t gliderlabs/$(NAME):latest .
+
+.PHONY: publish-release
+publish-release:
+	docker buildx build --push --platform linux/arm64,linux/amd64 -t gliderlabs/$(NAME):$(VERSION) .

README.md

@@ -311,7 +311,7 @@ logspout supports modification of the client TLS settings via environment variab
 | Environment Variable  | Description |
 | :---                  |  :---       |
 | `LOGSPOUT_TLS_DISABLE_SYSTEM_ROOTS` | when set to `true` it disables loading the system trust store into the trust store of logspout |
-| `LOGSPOUT_TLS_CA_CERTS` | a comma separated list of filesystem paths to pem encoded CA certificates that should be added to logsput's TLS trust store. Each pem file can contain more than one certificate |
+| `LOGSPOUT_TLS_CA_CERTS` | a comma separated list of filesystem paths to pem encoded CA certificates that should be added to logspout's TLS trust store. Each pem file can contain more than one certificate |
 | `LOGSPOUT_TLS_CLIENT_CERT` | filesystem path to pem encoded x509 client certificate to load when TLS mutual authentication is desired |
 | `LOGSPOUT_TLS_CLIENT_KEY` | filesystem path to pem encoded client private key to load when TLS mutual authentication is desired |
 | `LOGSPOUT_TLS_HARDENING` | when set to `true` it enables stricter client TLS settings designed to mitigate some known TLS vulnerabilities |

VERSION

@@ -1 +1 @@
-v3.2.13
+v3.2.14

go.mod

@@ -3,17 +3,24 @@ module github.com/gliderlabs/logspout
 go 1.13
 
 require (
+	github.com/Microsoft/hcsshim v0.8.14 // indirect
 	github.com/Sirupsen/logrus v0.10.1-0.20160601113210-f3cfb454f4c2 // indirect
-	github.com/docker/docker v1.4.2-0.20160708193732-ad969f1aa782 // indirect
+	github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68 // indirect
+	github.com/containerd/containerd v1.4.3 // indirect
+	github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7 // indirect
+	github.com/docker/docker v20.10.3+incompatible // indirect
 	github.com/docker/engine-api v0.3.2-0.20160708123604-98348ad6f9c8 // indirect
-	github.com/docker/go-units v0.3.1 // indirect
-	github.com/fsouza/go-dockerclient v0.0.0-20160624230725-1a3d0cfd7814
+	github.com/fsouza/go-dockerclient v1.7.0
+	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/gorilla/context v0.0.0-20160525203319-aed02d124ae4 // indirect
-	github.com/gorilla/mux v0.0.0-20160605233521-9fa818a44c2b
+	github.com/gorilla/mux v1.8.0
 	github.com/hashicorp/go-cleanhttp v0.0.0-20160407174126-ad28ea4487f0 // indirect
+	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/looplab/logspout-logstash v0.0.0-20171130125839-68a4e47e757d
+	github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
 	github.com/opencontainers/runc v1.0.0-rc1.0.20160706165155-9d7831e41d3e // indirect
-	github.com/stretchr/testify v1.4.0 // indirect
-	golang.org/x/net v0.0.0-20160707223729-f841c39de738
-	golang.org/x/sys v0.0.0-20160704031755-a408501be4d1 // indirect
+	go.opencensus.io v0.22.6 // indirect
+	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
+	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect
+	golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect
 )