add v1.3.0 package hash

alibaba · Dec 2, 2022 · db933ea · db933ea
1 parent f900f5a
commit db933ea
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 89 deletions.
diff --git a/Makefile b/Makefile
@@ -198,4 +198,5 @@ docker: $(DIST_FILE)
 
 .PHONY: multi-arch-docker
 multi-arch-docker: $(DIST_FILE)
+	@echo "will push to $(DOCKER_REPOSITORY):edge. Make sure this tag does not exist or push will fail."
 	./scripts/docker_build.sh multi-arch-production $(GENERATED_HOME) $(VERSION) $(DOCKER_REPOSITORY) $(DOCKER_PUSH)
diff --git a/core/common/MachineInfoUtil.cpp b/core/common/MachineInfoUtil.cpp
@@ -435,6 +435,7 @@ bool IsDigitsDotsHostname(const char* hostname) {
         }
         return true;
     }
+    return false;
 }
 
 } // namespace logtail
diff --git a/docker/build-multi-arch-build-image.sh b/docker/build-multi-arch-build-image.sh
@@ -17,9 +17,12 @@
 set -ue
 set -o pipefail
 
+TAG_VERSION=latest
+
+docker manifest rm sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:${TAG_VERSION}
 docker manifest create \
-sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:latest \
---amend sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux-amd64:latest \
---amend sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux-arm64:latest
+sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:${TAG_VERSION} \
+--amend sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux-amd64:${TAG_VERSION} \
+--amend sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux-arm64:${TAG_VERSION}
 
-docker manifest push sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:latest
+docker manifest push sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:${TAG_VERSION}
diff --git a/docs/cn/installation/release-notes.md b/docs/cn/installation/release-notes.md
@@ -36,15 +36,15 @@
 
 | 文件名                                                                                                                                          | 系统    | 架构     | SHA256 校验码                                                       |
 | -------------------------------------------------------------------------------------------------------------------------------------------- | ----- | ------ | ---------------------------------------------------------------- |
-| [ilogtail-1.3.0.linux-amd64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.3.0/ilogtail-1.3.0.linux-amd64.tar.gz) | Linux | x86-64 | - |
-| [ilogtail-1.3.0.linux-arm64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.3.0/ilogtail-1.3.0.linux-arm64.tar.gz) | Linux | arm64  | - |
+| [ilogtail-1.3.0.linux-amd64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.3.0/ilogtail-1.3.0.linux-amd64.tar.gz) | Linux | x86-64 | 5ef5672a226089aa98dfb71dc48b01254b9b77c714466ecc1b6c4d9c0df60a50 |
+| [ilogtail-1.3.0.linux-arm64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.3.0/ilogtail-1.3.0.linux-arm64.tar.gz) | Linux | arm64  | 73d33d4cac90543ea5c2481928e090955643c6dc6839535f53bfa54b6101704d |
 
 ### Docker 镜像
 
 **Docker Pull 命令**&#x20;
 
 ```
-docker pull sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail:1.1.0-k8s-patch
+docker pull sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail:1.3.0
 ```
 
 ## 1.2.1
@@ -83,7 +83,7 @@ docker pull sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-communi
 **Docker Pull 命令**&#x20;
 
 ```
-docker pull sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail:1.1.0-k8s-patch
+docker pull sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail:1.2.1
 ```
 
 ## 1.1.1
@@ -110,7 +110,7 @@ docker pull sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-communi
 **Docker Pull 命令**&#x20;
 
 ```
-docker pull sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail:1.1.0-k8s-patch
+docker pull sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail:1.1.1
 ```
 
 ## 1.1.0

diff --git a/scripts/docker_build.sh b/scripts/docker_build.sh
@@ -74,6 +74,7 @@ fi
 echo "=============DOCKERFILE=================="
 cat $GEN_DOCKERFILE
 echo "========================================="
+
 if [[ $CATEGORY != "multi-arch-production" ]]; then
     docker build --build-arg TARGETPLATFORM=linux/$ARCH \
 	--build-arg VERSION="$VERSION" \
@@ -89,7 +90,7 @@ else
         --no-cache -f $GEN_DOCKERFILE .
 fi
 
-if [[ $PUSH = "true" ]]; then
+if [[ $PUSH = "true" && $CATEGORY != "multi-arch-production" ]]; then
     echo "COMMAND:"
     echo "docker push $REPOSITORY:$VERSION"
     if [[ $VERSION = "latest" ]]; then

diff --git a/upload_release_assets.sh b/upload_release_assets.sh