southfox/miniflux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix auto-generated version (git describe)

Browse source
This commit is contained in:
Frédéric Guillot 2020-11-03 15:14:57 -08:00
parent b8f7f44bb0
commit b539eb8575
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,6 +1,6 @@
APP := miniflux APP := miniflux
DOCKER_IMAGE := miniflux/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) COMMIT := $(shell git rev-parse --short HEAD)
BUILD_DATE := `date +%FT%T%z` 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)'" LD_FLAGS := "-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.Commit=$(COMMIT)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'"

2
packaging/debian/build.sh
View file

@ -2,7 +2,7 @@
PKG_ARCH=`dpkg --print-architecture` PKG_ARCH=`dpkg --print-architecture`
PKG_DATE=`date -R` 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_VERSION=$PKG_VERSION"
echo "PKG_ARCH=$PKG_ARCH" echo "PKG_ARCH=$PKG_ARCH"

2
packaging/docker/Dockerfile
View file

@ -5,7 +5,7 @@ WORKDIR /go/src/app
RUN go generate RUN go generate
RUN go build \ RUN go build \
-o miniflux \ -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 main.go
FROM alpine:latest FROM alpine:latest

2
packaging/rpm/Dockerfile
View file

@ -4,7 +4,7 @@ WORKDIR /go/src/app
RUN go generate RUN go generate
RUN go build \ RUN go build \
-o miniflux \ -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 main.go
FROM centos:latest FROM centos:latest