Merge branch 'main' of https://github.com/drycc/stacks

Author: zhangeamon

Dockerfile

@@ -73,4 +73,4 @@ RUN UPX_VERSION=4.1.0; \
   tar -Jxvf upx-${UPX_VERSION}-${OS_ARCH}_linux.tar.xz; \
   cp upx-${UPX_VERSION}-${OS_ARCH}_linux/upx /usr/local/bin; \
   rm -rf upx-*; \
-  pip install oss2;
+  pip install oss2 packaging;

build.sh

@@ -73,6 +73,52 @@ function renew() {
   git push --tag
 }
 
+function patch() {
+    # Validate arguments
+    if [[ $# -ne 3 ]]; then
+        echo "Usage: ${FUNCNAME[0]} <tar.gz> <inner_file> <replacement>" >&2
+        return 1
+    fi
+    local tar_file="$1"
+    local inner_file="$2"
+    local replacement_file="$3"
+    # Check if files exist
+    if [[ ! -f "$tar_file" ]]; then
+        echo "Error: Tar file '$tar_file' not found" >&2
+        return 1
+    fi
+    if [[ ! -f "$replacement_file" ]]; then
+        echo "Error: Replacement file '$replacement_file' not found" >&2
+        return 1
+    fi
+    # Create temporary directory
+    local temp_dir
+    temp_dir=$(mktemp -d) || {
+        echo "Error: Failed to create temporary directory" >&2
+        return 1
+    }
+    trap "rm -rf '$temp_dir'" EXIT
+    # Extract tar file
+    if ! tar -xzf "$tar_file" -C "$temp_dir" 2>/dev/null; then
+        echo "Error: Failed to extract '$tar_file'" >&2
+        return 1
+    fi
+    # Check if inner file exists in archive
+    if [[ ! -f "${temp_dir}/${inner_file}" ]]; then
+        echo "Error: File '$inner_file' not found in archive" >&2
+        return 1
+    fi
+    # Replace the file
+    if ! cp "$replacement_file" "${temp_dir}/${inner_file}"; then
+        echo "Error: Failed to replace file" >&2
+        return 1
+    fi
+
+    tar --numeric-owner -czf "${tar_file: :-7}.patched.tar.gz" -C "$temp_dir" . --transform='s,^./,,'
+    echo "Success: File replaced in '$tar_file'"
+    return 0
+}
+
 function clean-tags() {
   for tag in $(git tag --sort creatordate|head -n "$1")
   do
@@ -99,4 +145,4 @@ if ! _is_sourced; then
   action=$1
   shift 1
   $action "$@"
-fi
+fi

scripts/checker.py

@@ -38,12 +38,6 @@
         "owner": "dbeaver",
         "match": "[2-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$",
     },
-    "vouch-proxy": {
-        "name": "vouch-proxy",
-        "type": "github",
-        "owner": "vouch",
-        "match": "^v[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$",
-    },
     "redis_exporter": {
         "name": "redis_exporter",
         "type": "github",
@@ -224,6 +218,12 @@
         "owner": "python",
         "match": "^v[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$",
     },
+    "quickwit": {
+        "name": "quickwit",
+        "type": "github",
+        "owner": "quickwit-oss",
+        "match": "^v[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$",
+    },
     "rabbitmq": {
         "name": "rabbitmq-server",
         "type": "github",
@@ -380,6 +380,12 @@
         "owner": "opensearch-project",
         "match": "^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$",
     },
+    "opentelemetry-collector": {
+        "name": "opentelemetry-collector",
+        "type": "github",
+        "owner": "open-telemetry",
+        "match": "^v[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$",
+    },
     "seaweedfs": {
         "name": "seaweedfs",
         "type": "github",

scripts/storage.py

@@ -2,6 +2,7 @@
 import re
 import sys
 import oss2
+from packaging.version import parse
 
 
 bucket = oss2.Bucket(
@@ -48,18 +49,20 @@ def upload_list(stack_name, dist_dir):
 
 
 def symlink(stack_name, version):
-    symlink_list = []
     object_list = [
         obj.key for obj in bucket.list_objects(
             f"stacks/{stack_name}/{stack_name}-{version}.").object_list
     ]
-    object_list.sort(reverse=True)
+    prefix = f"stacks/{stack_name}/{stack_name}-"
+    version_list = sorted(
+        [obj.replace(prefix, "").split("-", 1)[0] for obj in object_list],
+        key=parse,
+        reverse=True,
+    )
     for obj in object_list:
-        name = f"stacks/{stack_name}/{stack_name}-{version}"
-        symlink = re.sub("%s.([0-9]\.?){1,}" % name, name, obj)
-        if symlink != obj and symlink not in symlink_list:
+        if obj.startswith(f"{prefix}{version_list[0]}-"):
+            symlink = re.sub("%s.([0-9]\.?){1,}" % f"{prefix}{version}", f"{prefix}{version}", obj)
             bucket.put_symlink(obj, symlink)
-            symlink_list.append(symlink)
 
 
 if __name__ == "__main__":

stacks/opentelemetry-collector/build.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Load stack utils
+. /usr/bin/stack-utils
+
+# Implement build function
+function build() {
+  generate-stack-path
+  curl -sSL https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v${STACK_VERSION}/otelcol-contrib_${STACK_VERSION}_linux_${OS_ARCH}.tar.gz | tar -xvz
+
+  BIN_DIR="${DATA_DIR}"/bin
+  mkdir -p "${BIN_DIR}"
+  mv otelcol-contrib "${BIN_DIR}"/otelcol
+  rm  -rf README.md
+  #upx
+  upx --lzma --best "${BIN_DIR}"/*
+}
+
+# call build stack
+build-stack "${1}"

stacks/quickwit/build.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Load stack utils
+. /usr/bin/stack-utils
+
+# Implement build function
+function build() {
+  generate-stack-path
+
+  curl -sSL "https://github.com/quickwit-oss/quickwit/releases/download/v${STACK_VERSION}/quickwit-v${STACK_VERSION}-$(uname -m)-unknown-linux-gnu.tar.gz" | tar -xz
+  BIN_DIR="${DATA_DIR}"/bin
+  mkdir -p "${BIN_DIR}"
+
+  cp quickwit-v${STACK_VERSION}/quickwit "${BIN_DIR}"
+  cp -rf quickwit-v${STACK_VERSION}/config "${DATA_DIR}"
+  rm -rf quickwit-v${STACK_VERSION}
+
+  # upx
+  upx --lzma --best "${BIN_DIR}"/*
+}
+
+# call build stack
+build-stack "${1}"