From 9799665951a5a2cc108d2f1ebcd4a20b84c89293 Mon Sep 17 00:00:00 2001 From: Harvey Tindall Date: Mon, 22 Feb 2021 01:26:07 +0000 Subject: [PATCH] fix tag versioning and dockerfile --- Dockerfile | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fd726b1..b9fbe73 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update -y \ && apt-get install build-essential python3-pip curl software-properties-common sed -y \ && (curl -sL https://deb.nodesource.com/setup_14.x | bash -) \ && apt-get install nodejs \ - && (cd /opt/build; make configuration npm email version typescript bundle-css swagger copy external-files GOESBUILD=on) \ + && (cd /opt/build; make configuration npm email typescript bundle-css swagger copy external-files GOESBUILD=on) \ && sed -i 's#id="password_resets-watch_directory" placeholder="/config/jellyfin"#id="password_resets-watch_directory" value="/jf" disabled#g' /opt/build/build/data/html/setup.html diff --git a/Makefile b/Makefile index b765386..9b59660 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ else endif GOBINARY ?= go -VERSION ?= $(shell git describe --exact-match HEAD &> /dev/null || echo vgit) +VERSION ?= $(shell git describe --exact-match HEAD 2> /dev/null || echo vgit) VERSION := $(shell echo $(VERSION) | sed 's/v//g') COMMIT ?= $(shell git rev-parse --short HEAD || echo unknown)