Skip to content
This repository was archived by the owner on Feb 3, 2022. It is now read-only.

Commit

Permalink
Revert ASLR PR, need more time to investigate failures in the Dockerfile
Browse files Browse the repository at this point in the history
Signed-off-by: Valery Piashchynski <[email protected]>
  • Loading branch information
rustatian committed Oct 23, 2021
1 parent e7a9c86 commit 9dfdc59
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Makefile.docker
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion dev/Makefile
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 9dfdc59

Please sign in to comment.