Skip to content

Commit 332dba7

Browse files
committed
corrected get of APP_VERSION
Signed-off-by: Alexander Piskun <[email protected]>
1 parent a5a4662 commit 332dba7

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
APP_ID := visionatrix
44
APP_NAME := Visionatrix
5-
APP_VERSION := $$(xmlstarlet sel -t -v "//image-tag" appinfo/info.xml)
5+
APP_VERSION := $$(xmlstarlet sel -t -v "//version" appinfo/info.xml)
6+
VISIONATRIX_VERSION := $$(xmlstarlet sel -t -v "//image-tag" appinfo/info.xml)
67
JSON_INFO := "{\"id\":\"$(APP_ID)\",\"name\":\"$(APP_NAME)\",\"daemon_config_name\":\"manual_install\",\"version\":\"$(APP_VERSION)\",\"secret\":\"12345\",\"port\":9100, \"routes\": [{\"url\":\".*\",\"verb\":\"GET, POST, PUT, DELETE\",\"access_level\":1,\"headers_to_exclude\":[]}], \"translations_folder\":\"\/tmp\/vix_l10n\"}"
78

89

@@ -36,19 +37,19 @@ help:
3637
build-push-cpu:
3738
npm ci && npm run build
3839
docker login ghcr.io
39-
docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag ghcr.io/cloud-py-api/$(APP_ID):$(APP_VERSION) --build-arg BUILD_TYPE=cpu .
40+
docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag ghcr.io/cloud-py-api/$(APP_ID):$(VISIONATRIX_VERSION) --build-arg BUILD_TYPE=cpu .
4041

4142
.PHONY: build-push-cuda
4243
build-push-cuda:
4344
npm ci && npm run build
4445
docker login ghcr.io
45-
docker buildx build --push --platform linux/amd64 --tag ghcr.io/cloud-py-api/$(APP_ID):$(APP_VERSION)-cuda --build-arg BUILD_TYPE=cuda .
46+
docker buildx build --push --platform linux/amd64 --tag ghcr.io/cloud-py-api/$(APP_ID):$(VISIONATRIX_VERSION)-cuda --build-arg BUILD_TYPE=cuda .
4647

4748
.PHONY: build-push-rocm
4849
build-push-rocm:
4950
npm ci && npm run build
5051
docker login ghcr.io
51-
docker buildx build --push --platform linux/amd64 --tag ghcr.io/cloud-py-api/$(APP_ID):$(APP_VERSION)-rocm --build-arg BUILD_TYPE=rocm .
52+
docker buildx build --push --platform linux/amd64 --tag ghcr.io/cloud-py-api/$(APP_ID):$(VISIONATRIX_VERSION)-rocm --build-arg BUILD_TYPE=rocm .
5253

5354
.PHONY: run30
5455
run30:

0 commit comments

Comments
 (0)