From 9dfdc5912690804c4e87b4965e8fc08ff197d4d7 Mon Sep 17 00:00:00 2001
From: Valery Piashchynski <piashchynski.valery@gmail.com>
Date: Sat, 23 Oct 2021 11:45:15 +0300
Subject: [PATCH] Revert ASLR PR, need more time to investigate failures in the
 Dockerfile

Signed-off-by: Valery Piashchynski <piashchynski.valery@gmail.com>
---
 .github/workflows/release.yml | 2 +-
 .github/workflows/tests.yml   | 2 +-
 Dockerfile                    | 2 +-
 Makefile                      | 2 +-
 Makefile.docker               | 2 +-
 dev/Makefile                  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f713712..c4ad450 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -68,7 +68,7 @@ jobs:
             -X github.com/spiral/roadrunner-binary/v2/internal/meta.version=${{ steps.slug.outputs.version }}
             -X github.com/spiral/roadrunner-binary/v2/internal/meta.buildTime=${{ steps.values.outputs.timestamp }}
         run: |
-          go build -trimpath -buildmode=pie -ldflags "$LDFLAGS" -o "./${{ steps.values.outputs.binary-name }}" ./cmd/rr
+          go build -trimpath -ldflags "$LDFLAGS" -o "./${{ steps.values.outputs.binary-name }}" ./cmd/rr
           stat "./${{ steps.values.outputs.binary-name }}"
 
       - name: Generate distributive directory name
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b0b2ce6..1ac6c98 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -121,7 +121,7 @@ jobs:
           LDFLAGS: -s
             -X github.com/spiral/roadrunner-binary/v2/internal/meta.version=${{ steps.slug.outputs.version }}@${{ steps.slug.outputs.commit-hash-short }}
             -X github.com/spiral/roadrunner-binary/v2/internal/meta.buildTime=${{ steps.values.outputs.timestamp }}
-        run: go build -trimpath -buildmode=pie -ldflags "$LDFLAGS" -o ./rr ./cmd/rr
+        run: go build -trimpath -ldflags "$LDFLAGS" -o ./rr ./cmd/rr
 
       - name: Try to execute
         if: matrix.os == 'linux'
diff --git a/Dockerfile b/Dockerfile
index 7260c1c..ac4981b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ ENV LDFLAGS="-s \
 
 # compile binary file
 RUN set -x \
-    && CGO_ENABLED=0 go build -buildmode=pie -trimpath -ldflags "$LDFLAGS" -o ./rr ./cmd/rr \
+    && CGO_ENABLED=0 go build -trimpath -ldflags "$LDFLAGS" -o ./rr ./cmd/rr \
     && ./rr -v
 
 # Image page: <https://hub.docker.com/_/alpine>
diff --git a/Makefile b/Makefile
index e0dfc28..ef77b54 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
 test:
 	go test -v -race ./...
 build:
-	CGO_ENABLED=0 go build -buildmode=pie -trimpath -ldflags "-s" -o rr qcmd/rr/main.go
+	CGO_ENABLED=0 go build -trimpath -ldflags "-s" -o rr qcmd/rr/main.go
diff --git a/Makefile.docker b/Makefile.docker
index 071e28c..db70f9b 100644
--- a/Makefile.docker
+++ b/Makefile.docker
@@ -20,7 +20,7 @@ image: ## Build docker image with app
 
 build: ## Build app binary file
 	docker run $(DOCKER_GO_RUN_ARGS) -e "CGO_ENABLED=0" "golang:$(GO_VERSION)-buster" \
-		go build -trimpath -buildmode=pie -ldflags "-s" -o ./rr ./cmd/rr
+		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" \
diff --git a/dev/Makefile b/dev/Makefile
index e0dc9d8..71c0ed5 100644
--- a/dev/Makefile
+++ b/dev/Makefile
@@ -1,2 +1,2 @@
 build:
-	CGO_ENABLED=0 go build -buildmode=pie -trimpath -ldflags "-s" -o rr ../cmd/rr/main.go
+	CGO_ENABLED=0 go build -trimpath -ldflags "-s" -o rr ../cmd/rr/main.go