This is an automated email from the ASF dual-hosted git repository.
zhongxjian pushed a commit to branch release-0.1
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
The following commit(s) were added to refs/heads/release-0.1 by this push:
new 42622f54 Release 0.1 (#743)
42622f54 is described below
commit 42622f548016725feeda34b3bd052ffb104b952b
Author: Jian Zhong <[email protected]>
AuthorDate: Fri Jul 4 09:01:57 2025 +0800
Release 0.1 (#743)
* Update Dubboctl sdk language
* Update release 0.1.2
---
.github/workflows/release.yaml | 14 ++++-
dubboctl/pkg/sdk/dubbo/dockerfile.go | 41 +--------------
dubboctl/pkg/sdk/templates_embedded.go | 1 +
release/downloadDubboCandidate.sh | 94 ----------------------------------
samples/app/provider/deployment.yaml | 36 -------------
samples/app/provider/service.yaml | 28 ----------
6 files changed, 15 insertions(+), 199 deletions(-)
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 288cd774..7280e482 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -92,7 +92,7 @@ jobs:
- name: Download dependencies
run: go mod download
- - name: Build binary
+ - name: Dubboctl Build binary
env:
GOOS: ${{ matrix.goos }}
GOARCH: ${{ matrix.goarch }}
@@ -100,9 +100,19 @@ jobs:
run: |
mkdir -p build/
make build-dubboctl GOOS=${GOOS} GOARCH=${GOARCH}
GIT_VERSION=${GIT_VERSION}
- make build-dubbo-cp GOOS=${GOOS} GOARCH=${GOARCH}
GIT_VERSION=${GIT_VERSION}
cp README.md LICENSE build/
mv bin/dubboctl* build/
+ ls -ln build/
+
+ - name: Dubbo-CP Build binary
+ env:
+ GOOS: ${{ matrix.goos }}
+ GOARCH: ${{ matrix.goarch }}
+ GIT_VERSION: ${{ github.ref_name }}
+ run: |
+ mkdir -p build/
+ make build-dubbo-cp GOOS=${GOOS} GOARCH=${GOARCH}
GIT_VERSION=${GIT_VERSION}
+ cp README.md LICENSE build/
mv bin/dubbo-cp* build/
ls -ln build/
diff --git a/dubboctl/pkg/sdk/dubbo/dockerfile.go
b/dubboctl/pkg/sdk/dubbo/dockerfile.go
index 318f8a9b..9c6c1c99 100644
--- a/dubboctl/pkg/sdk/dubbo/dockerfile.go
+++ b/dubboctl/pkg/sdk/dubbo/dockerfile.go
@@ -18,45 +18,8 @@
package dubbo
var (
- golang = `
-FROM golang:1.20-alpine AS builder
-
-LABEL stage=gobuilder
-
-ENV CGO_ENABLED=0 && GOPROXY=https://goproxy.cn,direct
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g'
/etc/apk/repositories
-
-WORKDIR /build
-
-WORKDIR /workspace
-COPY go.mod go.mod
-COPY go.sum go.sum
-COPY . .
-COPY ./conf /app/conf
-
-RUN go build -ldflags="-s -w" -o /app/dubbogo ./cmd
-
-FROM scratch
-
-WORKDIR /app
-
-COPY --from=builder /app/dubbogo /app/dubbogo
-COPY --from=builder /app/conf /app/conf
-
-ENV DUBBO_GO_CONFIG_PATH=/app/conf/dubbogo.yaml
-
-ENTRYPOINT ["./dubbogo"]
-`
-
- java = `
-FROM openjdk:8-jdk-alpine
-
-ADD target/demo-0.0.1-SNAPSHOT.jar /app.jar
-
-ENV JAVA_OPTS=""
-
-ENTRYPOINT ["sh", "-c", "exec java $JAVA_OPTS -jar /app.jar"]
-`
+ golang = ``
+ java = ``
DockerfileByRuntime = map[string]string{
"go": golang,
diff --git a/dubboctl/pkg/sdk/templates_embedded.go
b/dubboctl/pkg/sdk/templates_embedded.go
index 3475581e..420f5e1b 100644
--- a/dubboctl/pkg/sdk/templates_embedded.go
+++ b/dubboctl/pkg/sdk/templates_embedded.go
@@ -20,6 +20,7 @@ package sdk
import (
"archive/zip"
"bytes"
+ "github.com/apache/dubbo-kubernetes/dubboctl/pkg/sdk/common"
"github.com/apache/dubbo-kubernetes/dubboctl/pkg/util"
)
diff --git a/release/downloadDubboCandidate.sh
b/release/downloadDubboCandidate.sh
deleted file mode 100644
index 6ba0edbe..00000000
--- a/release/downloadDubboCandidate.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-set -e
-
-# Determines the operating system.
-OS="${TARGET_OS:-$(uname)}"
-if [ "${OS}" = "Darwin" ] ; then
- OSEXT="osx"
-else
- OSEXT="linux"
-fi
-
-# Package type, default to dubbo-cp
-PACKAGE_TYPE="${PACKAGE_TYPE:-dubbo-cp}"
-
-# Determine the latest Dubbo version by version number ignoring alpha, beta,
and rc versions.
-if [ "${DUBBO_VERSION}" = "" ] ; then
- DUBBO_VERSION="$(curl -s
https://api.github.com/repos/apache/dubbo-kubernetes/releases | \
- grep '"tag_name":' | \
- grep -vE '(alpha|beta|rc)' | \
- head -1 | \
- sed -E 's/.*"([^"]+)".*/\1/')"
- DUBBO_VERSION="${DUBBO_VERSION##*/}"
-fi
-
-if [ "${DUBBO_VERSION}" = "" ] ; then
- printf "Unable to get latest Dubbo version. Set DUBBO_VERSION env var and
re-run. For example: export DUBBO_VERSION=0.1.0\n"
- exit 1;
-fi
-
-LOCAL_ARCH=$(uname -m)
-if [ "${TARGET_ARCH}" ]; then
- LOCAL_ARCH=${TARGET_ARCH}
-fi
-
-case "${LOCAL_ARCH}" in
- x86_64|amd64)
- DUBBO_ARCH=amd64
- ;;
- armv8*|aarch64*|arm64)
- DUBBO_ARCH=arm64
- ;;
- armv*)
- DUBBO_ARCH=armv7
- ;;
- *)
- echo "This system's architecture, ${LOCAL_ARCH}, isn't supported"
- exit 1
- ;;
-esac
-
-NAME="${PACKAGE_TYPE}-${DUBBO_VERSION}"
-URL="https://github.com/apache/dubbo-kubernetes/releases/download/${DUBBO_VERSION}/${PACKAGE_TYPE}-${DUBBO_VERSION}-${OSEXT}.tar.gz";
-ARCH_URL="https://github.com/apache/dubbo-kubernetes/releases/download/${DUBBO_VERSION}/${PACKAGE_TYPE}-${DUBBO_VERSION}-${OSEXT}-${DUBBO_ARCH}.tar.gz";
-
-with_arch() {
- printf "\nDownloading %s from %s ...\n" "${NAME}" "$ARCH_URL"
- if ! curl -o /dev/null -sIf "$ARCH_URL"; then
- printf "\n%s is not found, please specify a valid DUBBO_VERSION and
TARGET_ARCH\n" "$ARCH_URL"
- return 1
- fi
- filename="${PACKAGE_TYPE}-${DUBBO_VERSION}-${OSEXT}-${DUBBO_ARCH}.tar.gz"
- curl -fLO "$ARCH_URL"
- tar -xzf "${filename}"
- rm "${filename}"
- return 0
-}
-
-without_arch() {
- printf "\nDownloading %s from %s ...\n" "$NAME" "$URL"
- if ! curl -o /dev/null -sIf "$URL"; then
- printf "\n%s is not found, please specify a valid DUBBO_VERSION\n" "$URL"
- return 1
- fi
- filename="${PACKAGE_TYPE}-${DUBBO_VERSION}-${OSEXT}.tar.gz"
- curl -fLO "$URL"
- tar -xzf "${filename}"
- rm "${filename}"
- return 0
-}
-
-if ! with_arch; then
- if ! without_arch; then
- echo "Download failed."
- exit 1
- fi
-fi
-
-printf "%s download complete!\n" "${filename}"
-
-# Print message.
-printf "\n"
-printf "Add the dubbo to your path with:\n"
-printf " export PATH=\$HOME/.dubbo/bin:\$PATH \n"
-printf "\n"
\ No newline at end of file
diff --git a/samples/app/provider/deployment.yaml
b/samples/app/provider/deployment.yaml
index 259843ae..e69de29b 100644
--- a/samples/app/provider/deployment.yaml
+++ b/samples/app/provider/deployment.yaml
@@ -1,36 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: dubbo-samples-provider
- namespace: dubbo-system
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: dubbo-samples-provider
- template:
- metadata:
- labels:
- app: dubbo-samples-provider
- spec:
- containers:
- - name: server
- image: apache/dubbo-demo:dubbo-samples-apiserver-provider_0.0.1
- imagePullPolicy: Always
- ports:
- - containerPort: 20880
\ No newline at end of file
diff --git a/samples/app/provider/service.yaml
b/samples/app/provider/service.yaml
index afe939b8..e69de29b 100644
--- a/samples/app/provider/service.yaml
+++ b/samples/app/provider/service.yaml
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: Service
-metadata:
- name: dubbo-samples-provider
- namespace: dubbo-system
-spec:
- clusterIP: None
- selector:
- app: dubbo-samples-provider
- ports:
- - protocol: TCP
- port: 20880
- targetPort: 20880
\ No newline at end of file
