Skip to content

Commit

Permalink
feat:support nacos-address server endpoints
Browse files Browse the repository at this point in the history
  • Loading branch information
chuntaojun committed Jun 29, 2024
1 parent 408b88f commit cca9e55
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 4 deletions.
34 changes: 32 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
password: ${{ secrets.POLARIS_DOCKER_PASSWORD }}

- name: Build Server
id: build-server
id: build-hub-server
env:
GOOS: ${{ matrix.goos }}
GOARCH: ${{ matrix.goarch }}
Expand All @@ -63,7 +63,7 @@ jobs:
make build-docker IMAGE_TAG=${DOCKER_TAG}
- name: Build Prometheus
id: build-prom
id: build-hub-prom
env:
GOOS: ${{ matrix.goos }}
GOARCH: ${{ matrix.goarch }}
Expand All @@ -72,3 +72,33 @@ jobs:
cd release/standalone/docker/prometheus
ls -lstrh
bash build_docker_prom.sh ${DOCKER_TAG}
- name: Log in to Tencent CCR
uses: docker/login-action@v1
with:
registry: ccr.ccs.tencentyun.com
username: ${{ secrets.TENCENT_DOCKER_NAME }}
password: ${{ secrets.TENCENT_DOCKER_PASSWORD }}

- name: Build Server
id: build-tencent-server
env:
DOCKER_REPOSITORY: ccr.ccs.tencentyun.com/polarismesh
GOOS: ${{ matrix.goos }}
GOARCH: ${{ matrix.goarch }}
DOCKER_TAG: ${{ steps.get_version.outputs.VERSION }}
run: |
ls -lstrh
make build-docker IMAGE_TAG=${DOCKER_TAG}
- name: Build Prometheus
id: build-tencent-prom
env:
DOCKER_REPOSITORY: ccr.ccs.tencentyun.com/polarismesh
GOOS: ${{ matrix.goos }}
GOARCH: ${{ matrix.goarch }}
DOCKER_TAG: ${{ steps.get_version.outputs.VERSION }}
run: |
cd release/standalone/docker/prometheus
ls -lstrh
bash build_docker_prom.sh ${DOCKER_TAG}
9 changes: 7 additions & 2 deletions release/standalone/docker/prometheus/build_docker_prom.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ fi

docker_tag=$1

echo "docker repository : polarismesh/polaris-prometheus, tag : ${docker_tag}"
docker_repository="${DOCKER_REPOSITORY}"
if [[ "${docker_repository}" == "" ]]; then
docker_repository="polarismesh"
fi

echo "docker repository : ${docker_repository}/polaris-prometheus, tag : ${docker_tag}"

docker buildx build --network=host -t polarismesh/polaris-prometheus:${docker_tag} -t polarismesh/polaris-prometheus:latest --platform linux/amd64,linux/arm64 --push ./
docker buildx build --network=host -t ${docker_repository}/polaris-prometheus:${docker_tag} -t ${docker_repository}/polaris-prometheus:latest --platform linux/amd64,linux/arm64 --push ./

0 comments on commit cca9e55

Please sign in to comment.