Merge #327

327: release 1.8.1 r=48d90782 a=48d90782

update docker image
fix tests

Co-authored-by: Valery Piashchynski <[email protected]>

5 files changed, 20 insertions, 17 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b17ad8da..de88fbe9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,21 @@
 CHANGELOG
 =========
 
+v1.8.1 (20.05.2020)
+-------------------
+- Update goridge version to 2.4.2
+- Fix code warnings from phpstan
+- Improve RPC
+- Create templates for the Bug reporting and Feature requests
+- Move docker images from golang-alpine to regular golang images
+- Add support for the CloudFlare CF-Connecting-IP and True-Client-IP headers (thanks @vsychov)
+- See the full milestone here: [link](https://github.com/spiral/roadrunner/milestone/11?closed=1)
+
 v1.8.0 (05.05.2020)
 -------------------
 - Update goridge version to 2.4.0
 - Update PHP version to the 7.2 (currently minimum supported)
-- See the full milestone here: [link](https://github.com/spiral/roadrunner/issues?q=is%3Aclosed+milestone%3A1.8.0)
+- See the full milestone here: [link](https://github.com/spiral/roadrunner/milestone/10?closed=1)
 
 v1.7.1 (22.04.2020)
 -------------------
diff --git a/Dockerfile b/Dockerfile
index f172f58b..c857515f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,12 @@
-# Image page: <https://hub.docker.com/_/golang>
-FROM golang:1.13-alpine as builder
+FROM golang:1.14.3 as builder
 
 COPY . /src
 
 WORKDIR /src
 
 RUN set -x \
-    && apk add --no-cache bash git \
+    && apt-get update -y \
+    && apt-get install -y bash git \
     && go version \
     && bash ./build.sh \
     && test -f ./.rr.yaml
diff --git a/build.sh b/build.sh
index b14bcb88..8689aeb7 100755
--- a/build.sh
+++ b/build.sh
@@ -3,7 +3,7 @@ cd $(dirname "${BASH_SOURCE[0]}")
 OD="$(pwd)"
 
 # Pushes application version into the build information.
-RR_VERSION=1.8.0
+RR_VERSION=1.8.1
 
 # Hardcode some values to the core package
 LDFLAGS="$LDFLAGS -X github.com/spiral/roadrunner/cmd/rr/cmd.Version=${RR_VERSION}"
diff --git a/cmd/rr/main.go b/cmd/rr/main.go
index 72498017..54a1f060 100644
--- a/cmd/rr/main.go
+++ b/cmd/rr/main.go
@@ -43,10 +43,6 @@ import (
 )
 
 func main() {
-
-	rr.Container.Register(logger.ID, &logrus.ConfigProvider{})
-	rr.Container.Register(config.ID, &cobra.ConfigPrivider{})
-
 	rr.Container.Register(env.ID, &env.Service{})
 	rr.Container.Register(rpc.ID, &rpc.Service{})
 	rr.Container.Register(http.ID, &http.Service{})
diff --git a/service/http/request.go b/service/http/request.go
index 176279df..8da5440f 100644
--- a/service/http/request.go
+++ b/service/http/request.go
@@ -2,16 +2,16 @@ package http
 
 import (
 	"fmt"
-	json "github.com/json-iterator/go"
-	"github.com/sirupsen/logrus"
-	"github.com/spiral/roadrunner"
-	"github.com/spiral/roadrunner/service/http/attributes"
 	"io/ioutil"
-	"log"
 	"net"
 	"net/http"
 	"net/url"
 	"strings"
+
+	json "github.com/json-iterator/go"
+	"github.com/sirupsen/logrus"
+	"github.com/spiral/roadrunner"
+	"github.com/spiral/roadrunner/service/http/attributes"
 )
 
 const (
@@ -95,9 +95,6 @@ func NewRequest(r *http.Request, cfg *UploadsConfig) (req *Request, err error) {
 		return req, err
 
 	case contentMultipart:
-		b, _ := ioutil.ReadAll(r.Body)
-		log.Print(string(b))
-
 		if err = r.ParseMultipartForm(defaultMaxMemory); err != nil {
 			return nil, err
 		}