summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md15
-rw-r--r--Makefile.docker37
2 files changed, 15 insertions, 37 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f8b1177..2ba5e6d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
# CHANGELOG
+## v2.10.7 (14.07.2022)
+
+## 👀 New:
+
+- ✏️ **OTEL Middleware**: Support for the `jaeger_agent` exporter - [BUG](https://github.com/roadrunner-server/roadrunner/issues/1205), (thanks @L3tum)
+
+## 📦 Packages:
+
+- 📦 `OTEL` SDK updated to `v1.8.0`
+- 📦 `google.golang.org/gRPC` updated to `v1.48.0`
+- 📦 `logger` plugin updated to `v2.13.5`
+- 📦 `Go` updated to `v1.18.4`
+
+---
+
## v2.10.6 (07.07.2022)
## 🩹 Fixes:
diff --git a/Makefile.docker b/Makefile.docker
deleted file mode 100644
index db70f9bf..00000000
--- a/Makefile.docker
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/make
-# Makefile manual (ru): <http://linux.yaroslavl.ru/docs/prog/gnu_make_3-79_russian_manual.html>
-# Makefile manual (en): <https://www.gnu.org/software/make/manual/html_node/index.html#SEC_Contents>
-
-SHELL = /bin/sh
-GO_VERSION = 1.17
-DOCKER_GO_RUN_ARGS = --rm -v "$(shell pwd):/src" -w "/src" -u "$(shell id -u):$(shell id -g)" -e "GOPATH=/tmp" -e "HOME=/tmp"
-
-.PHONY : help build fmt lint gotest test
-.DEFAULT_GOAL : help
-
-# This will output the help for each task. Thanks to https://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
-help: ## Show this help
- @printf "\033[33m%s:\033[0m\n" 'Available commands'
- @awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf " \033[32m%-11s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
-
-image: ## Build docker image with app
- docker build -f ./Dockerfile -t rr:local .
- @printf "\n \e[30;42m %s \033[0m\n\n" 'Now you can use image like `docker run --rm rr:local ...`';
-
-build: ## Build app binary file
- docker run $(DOCKER_GO_RUN_ARGS) -e "CGO_ENABLED=0" "golang:$(GO_VERSION)-buster" \
- go build -trimpath -ldflags "-s" -o ./rr ./cmd/rr
-
-fmt: ## Run source code formatter tools
- docker run $(DOCKER_GO_RUN_ARGS) -e "GO111MODULE=off" "golang:$(GO_VERSION)-buster" \
- sh -c 'go get golang.org/x/tools/cmd/goimports && $$GOPATH/bin/goimports -d -w .'
- docker run $(DOCKER_GO_RUN_ARGS) "golang:$(GO_VERSION)-buster" \
- sh -c 'gofmt -s -w -d .; go mod tidy'
-
-lint: ## Run app linters
- docker run $(DOCKER_GO_RUN_ARGS) -t golangci/golangci-lint:v1.39-alpine golangci-lint run
-
-gotest: ## Run app tests
- docker run $(DOCKER_GO_RUN_ARGS) -t "golang:$(GO_VERSION)-buster" go test -v -race -timeout 10s ./...
-
-test: lint gotest ## Run app tests and linters