diff options
| author |  Frédéric Guillot <f@miniflux.net>
| 2021-09-25 15:52:32 -0700 |
|---|---|---|
| committer | fguillot <f@miniflux.net>
| 2021-09-25 16:16:47 -0700 |
| commit | 423e06cbe8f57ddd553606b2373d70bc34502928 (patch) | |
| tree | 2faff5f064dc9f4ea49c4d07b7bad4d866a74f72 | |
| parent | 1f3a9dabc2c5b4a530fff64a4a916d67537cb60a (diff) | |
| download | v2-423e06cbe8f57ddd553606b2373d70bc34502928.tar.gz v2-423e06cbe8f57ddd553606b2373d70bc34502928.tar.zst v2-423e06cbe8f57ddd553606b2373d70bc34502928.zip | |
Build RPM and Debian package with PIE mode enabled
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | packaging/rpm/Dockerfile | 6 |
2 files changed, 2 insertions, 6 deletions
@@ -42,7 +42,7 @@ export PGPASSWORD := postgres debian-packages miniflux: - @ go build -ldflags=$(LD_FLAGS) -o $(APP) main.go + @ go build -buildmode=pie -ldflags=$(LD_FLAGS) -o $(APP) main.go linux-amd64: @ GOOS=linux GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-linux-amd64 main.go diff --git a/packaging/rpm/Dockerfile b/packaging/rpm/Dockerfile index 01d3f8ee..60f8a60d 100644 --- a/packaging/rpm/Dockerfile +++ b/packaging/rpm/Dockerfile @@ -1,11 +1,7 @@ FROM golang:1 AS build ADD . /go/src/app WORKDIR /go/src/app -RUN go generate -RUN go build \ - -o miniflux \ - -ldflags="-s -w -X 'miniflux.app/version.Version=`git describe --tags --abbrev=0`' -X 'miniflux.app/version.Commit=`git rev-parse --short HEAD`' -X 'miniflux.app/version.BuildDate=`date +%FT%T%z`'" \ - main.go +RUN make miniflux FROM centos:latest RUN dnf install -y rpm-build |