Merge pull request #14 from kubevela/v1.4

Feat: add chart build step and update readme
kubevela · May 24, 2022 · b4ae679 · b4ae679
2 parents 5594098 + 1f28593
commit b4ae679
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 5 deletions.
diff --git a/.github/workflows/helm-chart.yml b/.github/workflows/helm-chart.yml
@@ -26,17 +26,16 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Login docker.io
+      - name: Login Docker Hub
         uses: docker/login-action@v1
         with:
-          registry: docker.io
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Login Alibaba Cloud ACR
         uses: docker/login-action@v1
         with:
           registry: kubevela-registry.cn-hangzhou.cr.aliyuncs.com
-          username: ${{ secrets.ACR_USERNAME }}@aliyun-inner.com
+          username: ${{ secrets.ACR_USERNAME }}
           password: ${{ secrets.ACR_PASSWORD }}
       - uses: docker/setup-qemu-action@v1
       - uses: docker/setup-buildx-action@v1
@@ -45,13 +44,13 @@ jobs:
 
       - name: Build & Pushing vela-prism for ACR
         run: |
-          docker build --build-arg GOPROXY=https://proxy.golang.org -t kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-prism:${{ steps.vars.outputs.TAG }} .
+          docker build --build-arg GOPROXY=https://proxy.golang.org -t kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-prism:${{ steps.vars.outputs.TAG }} -f ./cmd/apiserver/Dockerfile .
           docker push kubevela-registry.cn-hangzhou.cr.aliyuncs.com/oamdev/vela-prism:${{ steps.vars.outputs.TAG }}
       - uses: docker/build-push-action@v2
         name: Build & Pushing vela-prism for Dockerhub and GHCR
         with:
           context: .
-          file: Dockerfile
+          file: ./cmd/apiserver/Dockerfile
           labels: |-
             org.opencontainers.image.source=https://github.com/${{ github.repository }}
             org.opencontainers.image.revision=${{ github.sha }}

diff --git a/README.md b/README.md
@@ -14,6 +14,20 @@ It works as a Kubernetes [Aggregated API Server](https://kubernetes.io/docs/conc
 
 ## Installation
 
+### From chart repository
+
+Add the chart repository
+```shell
+helm repo add prism https://charts.kubevela.net/prism
+helm repo update
+```
+
+Install helm chart
+```shell
+helm install vela-prism prism/vela-prism -n vela-system
+```
+
+### From this repo
 Clone this repo and run `helm install vela-prism charts/ --namespace vela-system`.
 
 ## Modules

diff --git a/charts/README.md b/charts/README.md
@@ -14,6 +14,20 @@ It works as a Kubernetes [Aggregated API Server](https://kubernetes.io/docs/conc
 
 ## Installation
 
+### From chart repository
+
+Add the chart repository
+```shell
+helm repo add prism https://charts.kubevela.net/prism
+helm repo update
+```
+
+Install helm chart
+```shell
+helm install vela-prism prism/vela-prism -n vela-system
+```
+
+### From this repo
 Clone this repo and run `helm install vela-prism charts/ --namespace vela-system`.
 
 ## Modules

diff --git a/cmd/apiserver/Dockerfile b/cmd/apiserver/Dockerfile
@@ -25,6 +25,7 @@ RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
 # Before copying the Go binary directly to the final image,
 # add them to the intermdediate upx image
 FROM gruebel/upx:latest as upx
+ARG TARGETARCH
 COPY --from=builder /workspace/vela-prism-${TARGETARCH} /workspace/vela-prism-${TARGETARCH}
 # Compress the binary and copy it to final image
 RUN upx --best --lzma -o /workspace/vela-prism-${TARGETARCH}-upx /workspace/vela-prism-${TARGETARCH}