summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorfumingwei <[email protected]>2023-05-22 16:52:03 +0800
committer付明卫 <[email protected]>2023-05-22 10:23:28 +0000
commit4a508c75e109e671f70d647d1fb267ce79527aa0 (patch)
tree4c31a2f20d034b624447107ac015da99e11af486 /make
parentb2bbc899ae007f7bbccce7d111f4dd5a473ad801 (diff)
bugfix:TSG-13281:修复生成traffic-engine压缩目录错误问题
Diffstat (limited to 'make')
-rw-r--r--make/Makefile.TSGXBUILDCONTAINERP09063
1 files changed, 1 insertions, 2 deletions
diff --git a/make/Makefile.TSGXBUILDCONTAINERP0906 b/make/Makefile.TSGXBUILDCONTAINERP0906
index c70cc298..c09ae45f 100644
--- a/make/Makefile.TSGXBUILDCONTAINERP0906
+++ b/make/Makefile.TSGXBUILDCONTAINERP0906
@@ -160,8 +160,7 @@ container-tar: installer container-images-generate
tar --exclude=*~ --exclude-backups --owner=root --group=root -c -C $(TARGET_CONTAINER_IMAGE_TAR_DIR) . | pbzip2 -p9 > $(IMAGEDIR_BASE)/$(CONTAINER_IMAGES_PKG)
/tmp/helm/linux-amd64/helm package --app-version $(OS_RELEASE_VER) --version $(HELM_CHART_VER) -d $(IMAGEDIR_BASE) $(PROJECTDIR)/ansible/roles/traffic-engine/files/helm
/tmp/helm/linux-amd64/helm package --app-version $(OS_RELEASE_VER) --version $(HELM_CHART_VER) -d $(IMAGEDIR_BASE) $(PROJECTDIR)/ansible/roles/k3s-exporter/files/mrzcpd/helm
- cd $(IMAGEDIR_BASE)
- tar -zcvf /tmp/$(TRAFFIC_ENGINE_TAR) .
+ tar -zcvf /tmp/$(TRAFFIC_ENGINE_TAR) -C $(IMAGEDIR_BASE) traffic-engine-$(HELM_CHART_VER).tgz exporter-mrzcpd-$(HELM_CHART_VER).tgz $(CONTAINER_IMAGES_PKG)
mv /tmp/$(TRAFFIC_ENGINE_TAR) $(IMAGEDIR_BASE)
sha256sum $(IMAGEDIR_BASE)/$(TRAFFIC_ENGINE_TAR) | awk '{print $$1}' > $(IMAGEDIR_BASE)/$(TRAFFIC_ENGINE_TAR).sha256sum.txt