Fix auto-generated version (git describe)
This commit is contained in:
parent
b8f7f44bb0
commit
b539eb8575
4 changed files with 4 additions and 4 deletions
2
Makefile
2
Makefile
|
@ -1,6 +1,6 @@
|
|||
APP := miniflux
|
||||
DOCKER_IMAGE := miniflux/miniflux
|
||||
VERSION := $(shell git describe --abbrev=0)
|
||||
VERSION := $(shell git describe --tags --abbrev=0)
|
||||
COMMIT := $(shell git rev-parse --short HEAD)
|
||||
BUILD_DATE := `date +%FT%T%z`
|
||||
LD_FLAGS := "-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.Commit=$(COMMIT)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
PKG_ARCH=`dpkg --print-architecture`
|
||||
PKG_DATE=`date -R`
|
||||
PKG_VERSION=`cd /src && git describe --abbrev=0`
|
||||
PKG_VERSION=`cd /src && git describe --tags --abbrev=0`
|
||||
|
||||
echo "PKG_VERSION=$PKG_VERSION"
|
||||
echo "PKG_ARCH=$PKG_ARCH"
|
||||
|
|
|
@ -5,7 +5,7 @@ WORKDIR /go/src/app
|
|||
RUN go generate
|
||||
RUN go build \
|
||||
-o miniflux \
|
||||
-ldflags="-s -w -X 'miniflux.app/version.Version=`git describe --abbrev=0`' -X 'miniflux.app/version.Commit=`git rev-parse --short HEAD`' -X 'miniflux.app/version.BuildDate=`date +%FT%T%z`'" \
|
||||
-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
|
||||
|
||||
FROM alpine:latest
|
||||
|
|
|
@ -4,7 +4,7 @@ WORKDIR /go/src/app
|
|||
RUN go generate
|
||||
RUN go build \
|
||||
-o miniflux \
|
||||
-ldflags="-s -w -X 'miniflux.app/version.Version=`git describe --abbrev=0`' -X 'miniflux.app/version.Commit=`git rev-parse --short HEAD`' -X 'miniflux.app/version.BuildDate=`date +%FT%T%z`'" \
|
||||
-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
|
||||
|
||||
FROM centos:latest
|
||||
|
|
Loading…
Reference in a new issue