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

Author: EamonZhang

.woodpecker/check.yml

@@ -7,13 +7,13 @@ pipeline:
 - name: check
   image: bash
   commands:
-  - docker run --rm
+  - podman run --rm
       --privileged
       --network host
       -e GITHUB_TOKEN=$GITHUB_TOKEN
       -v "$(pwd):$(pwd)"
       -w "$(pwd)"
-      drycc/python-dev
+      registry.drycc.cc/drycc/python-dev
       python scripts/checker.py
   secrets:
   - github_token

Dockerfile

@@ -1,4 +1,5 @@
-ARG CODENAME DRYCC_REGISTRY
+ARG CODENAME
+ARG DRYCC_REGISTRY
 FROM ${DRYCC_REGISTRY}/drycc/base:${CODENAME}
 
 RUN install-packages \

build.sh

@@ -16,15 +16,15 @@ BUILDPACK_DEP_IMAGE="${DRYCC_REGISTRY}"/drycc/buildpack-dep:"${CODENAME}"
 
 function create-buildpack-dep {
   # build buildpack-dep image
-  docker build --pull -f "${CURRENT_DIR}"/Dockerfile --build-arg CODENAME="${CODENAME}" --build-arg DRYCC_REGISTRY="${DRYCC_REGISTRY}" . -t "${BUILDPACK_DEP_IMAGE}"
+  podman build --pull -f "${CURRENT_DIR}"/Dockerfile --build-arg CODENAME="${CODENAME}" --build-arg DRYCC_REGISTRY="${DRYCC_REGISTRY}" . -t "${BUILDPACK_DEP_IMAGE}"
 }
 
 function build {
   mkdir -p "$DIST_DIR"
   STACK_NAME="${1:?STACK_NAME is required}"
   stack_version="${2:?stack_version is required}"
   create-buildpack-dep
-  docker run --rm \
+  podman run --rm \
     --privileged=true \
     --env STACK_DOWNLOAD_URL="${STACK_DOWNLOAD_URL:-}" \
     --env STACK_NAME="${STACK_NAME}" \
@@ -40,7 +40,7 @@ function build {
 function upload {
   STACK_NAME="${1:?stack_name is required}"
   create-buildpack-dep
-  docker run --rm \
+  podman run --rm \
     --env OSS_ENDPOINT=${OSS_ENDPOINT} \
     --env OSS_ACCESS_KEY_ID=${OSS_ACCESS_KEY_ID} \
     --env OSS_ACCESS_KEY_SECRET=${OSS_ACCESS_KEY_SECRET} \
@@ -53,7 +53,7 @@ function upload {
 }
 
 function symlink {
-  docker run --rm \
+  podman run --rm \
     --env OSS_ENDPOINT=${OSS_ENDPOINT} \
     --env OSS_ACCESS_KEY_ID=${OSS_ACCESS_KEY_ID} \
     --env OSS_ACCESS_KEY_SECRET=${OSS_ACCESS_KEY_SECRET} \

scripts/checker.py

@@ -115,6 +115,12 @@
         "search": r"https://aka.ms/download-jdk/microsoft-jdk-[0-9]{1,}.[0-9]{1,}.[0-9]{1,}-linux-x64.tar.gz",
         "version": r"[0-9]{1,}.[0-9]{1,}.[0-9]{1,}",
     },
+    "netcat": {
+        "url": "https://sourceforge.net/projects/netcat/files/netcat",
+        "type": "url",
+        "search": r"netcat-[0-9]{1,}.[0-9]{1,}.[0-9]{1,}.tar.bz2",
+        "version": r"[0-9]{1,}.[0-9]{1,}.[0-9]{1,}",
+    },
     "jq": {
         "name": "jq",
         "type": "github",
@@ -331,6 +337,12 @@
         "owner": "opensearch-project",
         "match": "^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$",
     },
+    "seaweedfs": {
+        "name": "seaweedfs",
+        "type": "github",
+        "owner": "seaweedfs",
+        "match": "^[0-9]{1,}\.[0-9]{1,}$",
+    },
 }
 
 

stacks/alertmanager/build.sh

@@ -12,7 +12,7 @@ function build() {
   mkdir -p "${BIN_DIR}"
   mv ./alertmanager-${STACK_VERSION}.linux-${OS_ARCH}/alertmanager "${BIN_DIR}"
   mv ./alertmanager-${STACK_VERSION}.linux-${OS_ARCH}/amtool "${BIN_DIR}"
-  rm  -rf ./prometheus-${STACK_VERSION}.linux-${OS_ARCH}
+  rm  -rf ./alertmanager-${STACK_VERSION}.linux-${OS_ARCH}
   #upx
   upx --lzma --best "${BIN_DIR}"/*
 }

stacks/pack/build.sh

@@ -6,19 +6,15 @@
 # Implement build function
 function build() {
   generate-stack-path
-  install-packages make
-  install-stack go "${GO_VERSION}" && . init-stack
-
-  curl -sSL "https://github.com/buildpacks/pack/archive/refs/tags/v${STACK_VERSION}.tar.gz" | tar -xz \
-  && cd pack-${STACK_VERSION} \
-  && make
-
+  if [[ "${OS_ARCH}" == "amd64" ]]; then
+    pack_download_url="https://github.com/buildpacks/pack/releases/download/v${STACK_VERSION}/pack-v${STACK_VERSION}-linux.tgz"
+  else
+    pack_download_url="https://github.com/buildpacks/pack/releases/download/v${STACK_VERSION}/pack-v${STACK_VERSION}-linux-${OS_ARCH}.tgz"
+  fi
   BIN_DIR="${DATA_DIR}"/bin
   mkdir -p "${BIN_DIR}"
-  mv ./out/pack "${BIN_DIR}"
-  rm -rf pack-${STACK_VERSION}
+  curl -sSL "${pack_download_url}" | tar xvz -C "${BIN_DIR}"
 }
 
 # call build stack
 build-stack "${1}"
-

stacks/seaweedfs/build.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# Load stack utils
+. /usr/bin/stack-utils
+
+# Implement build function
+function build() {
+  generate-stack-path
+  install-stack go "${GO_VERSION}" && . init-stack
+
+  BIN_DIR="${DATA_DIR}"/bin
+  mkdir -p "${BIN_DIR}"
+
+  # build weed
+  curl -sSL "https://github.com/seaweedfs/seaweedfs/archive/refs/tags/${STACK_VERSION}.tar.gz" | tar -xz \
+  && mv seaweedfs-${STACK_VERSION} $GOPATH/src/seaweedfs/ \
+  && cd $GOPATH/src/seaweedfs/weed \
+  && go install -tags "tikv"
+  mv $GOPATH/bin/weed "${BIN_DIR}"
+  cd -
+  
+
+  # seaweedfs-csi-driver
+  # WEED_CSI_VERSION=$(curl -Ls https://github.com/seaweedfs/seaweedfs-csi-driver/releases|grep /seaweedfs/seaweedfs-csi-driver/releases/tag/ | sed -E 's/.*\/seaweedfs\/seaweedfs-csi-driver\/releases\/tag\/v([0-9\.]{1,}(-rc.[0-9]{1,})?)".*/\1/g' | head -1)
+  WEED_CSI_VERSION=master
+  if [[ "$WEED_CSI_VERSION" == "master" ]]; then
+    WEED_CSI_URL="https://github.com/seaweedfs/seaweedfs-csi-driver/archive/refs/heads/${WEED_CSI_VERSION}.tar.gz"
+  else
+    WEED_CSI_URL="https://github.com/seaweedfs/seaweedfs-csi-driver/archive/refs/tags/v${WEED_CSI_VERSION}.tar.gz"
+  fi
+  curl -sSL "${WEED_CSI_URL}" | tar -xz \
+  && mv seaweedfs-csi-driver-${WEED_CSI_VERSION} $GOPATH/src/seaweedfs-csi-driver/ \
+  && cd $GOPATH/src/seaweedfs-csi-driver \
+  && go build -o "${BIN_DIR}"/weed-csi ./cmd/seaweedfs-csi-driver/main.go
+
+  # upx
+  upx --lzma --best "${BIN_DIR}"/*
+}
+
+# call build stack
+build-stack "${1}"