Fixed Makefile issues present on ubuntu
This commit is contained in:
5
Makefile
5
Makefile
@@ -1,9 +1,6 @@
|
|||||||
#!make
|
#!make
|
||||||
SHELL := /bin/bash
|
SHELL := /bin/bash
|
||||||
|
|
||||||
export API_VERSION = $(shell awk -F ' = ' '$$1 ~ /package.version/ { gsub(/[\"]/, "", $$2); printf("%s",$$2) }' api/Cargo.toml)
|
|
||||||
export UI_VERSION := $(shell awk -F'"' '/"version"/ { print $$4 }' ui/package.json)
|
|
||||||
|
|
||||||
include .env
|
include .env
|
||||||
-include .env.local
|
-include .env.local
|
||||||
export
|
export
|
||||||
@@ -105,7 +102,7 @@ build: ## Build a specific docker image (`make build f=httpd`)
|
|||||||
--load \
|
--load \
|
||||||
--build-arg BUILD_DATE=$$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
|
--build-arg BUILD_DATE=$$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
|
||||||
--build-arg BUILD_VERSION=${version} \
|
--build-arg BUILD_VERSION=${version} \
|
||||||
--build-arg VCS_REF=$$(git rev-parse head) \
|
--build-arg VCS_REF=$$(git rev-parse HEAD) \
|
||||||
${folder}
|
${folder}
|
||||||
|
|
||||||
docker-build: build
|
docker-build: build
|
||||||
|
|||||||
Reference in New Issue
Block a user