chore: change for fitting new server system

This commit is contained in:
2026-03-05 15:32:43 +08:00
parent 96f047d030
commit 9413442f5c
4 changed files with 93 additions and 91 deletions

View File

@@ -1,36 +1,36 @@
name: Docker Image CI name: Docker Image CI
on: on:
push: push:
branches: branches:
- dev - dev
jobs: jobs:
build: build:
runs-on: gitea-official-runner runs-on: gitea-runner-group-candlelight
container: container:
image: harbor.merlin.xin/release/merlin/action_builder:v0.0.1 image: ${{ vars.HARBOR_URL }}/candlelight/action_builder:v0.0.1
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: docker login - name: docker login
env: env:
HARBOR_USERNAME: ${{ secrets.HARBOR_ROBOT }} HARBOR_USERNAME: ${{ secrets.HARBOR_ROBOT }}
HARBOR_PASSWORD: ${{ secrets.HARBOR_ROBOT_SECRET }} HARBOR_PASSWORD: ${{ secrets.HARBOR_ROBOT_SECRET }}
HARBOR_URL: ${{ vars.HARBOR_URL }} HARBOR_URL: ${{ vars.HARBOR_URL }}
run: docker login ${HARBOR_URL} -u ${HARBOR_USERNAME} -p ${HARBOR_PASSWORD} run: docker login ${HARBOR_URL} -u ${HARBOR_USERNAME} -p ${HARBOR_PASSWORD}
- name: Build and push Docker images - name: Build and push Docker images
env: env:
HARBOR_URL: ${{ vars.HARBOR_URL }} HARBOR_URL: ${{ vars.HARBOR_URL }}
TAG: ${{ github.sha }} TAG: ${{ github.sha }}
REPOSITORY: ${{ github.repository }} REPOSITORY: ${{ github.repository }}
run: | run: |
ROOT_DIR=$(pwd) ROOT_DIR=$(pwd)
IMAGE_NAME="${HARBOR_URL}/testing/$REPOSITORY:${TAG}" IMAGE_NAME="${HARBOR_URL}/testing/$REPOSITORY:${TAG}"
echo "Building image: ${IMAGE_NAME}" echo "Building image: ${IMAGE_NAME}"
docker build -t ${IMAGE_NAME} . docker build -t ${IMAGE_NAME} .
echo "Pushing image: ${IMAGE_NAME}" echo "Pushing image: ${IMAGE_NAME}"
docker push ${IMAGE_NAME} docker push ${IMAGE_NAME}
echo "Successfully pushed: ${IMAGE_NAME}" echo "Successfully pushed: ${IMAGE_NAME}"
docker rmi ${IMAGE_NAME} docker rmi ${IMAGE_NAME}
echo "cleaned up local image" echo "cleaned up local image"

View File

@@ -1,34 +1,34 @@
name: Docker Image CI name: Docker Image CI
on: on:
push: push:
tags: tags:
- '*' - '*'
jobs: jobs:
build: build:
runs-on: gitea-official-runner runs-on: gitea-runner-group-candlelight
container: container:
image: harbor.merlin.xin/release/merlin/action_builder:v0.0.1 image: ${{ vars.HARBOR_URL }}/candlelight/action_builder:v0.0.1
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: docker login - name: docker login
env: env:
HARBOR_USERNAME: ${{ secrets.HARBOR_ROBOT }} HARBOR_USERNAME: ${{ secrets.HARBOR_ROBOT }}
HARBOR_PASSWORD: ${{ secrets.HARBOR_ROBOT_SECRET }} HARBOR_PASSWORD: ${{ secrets.HARBOR_ROBOT_SECRET }}
HARBOR_URL: ${{ vars.HARBOR_URL }} HARBOR_URL: ${{ vars.HARBOR_URL }}
run: docker login ${HARBOR_URL} -u ${HARBOR_USERNAME} -p ${HARBOR_PASSWORD} run: docker login ${HARBOR_URL} -u ${HARBOR_USERNAME} -p ${HARBOR_PASSWORD}
- name: Build and push Docker images - name: Build and push Docker images
env: env:
HARBOR_URL: ${{ vars.HARBOR_URL }} HARBOR_URL: ${{ vars.HARBOR_URL }}
REPOSITORY: ${{ github.repository }} REPOSITORY: ${{ github.repository }}
run: | run: |
ROOT_DIR=$(pwd) ROOT_DIR=$(pwd)
IMAGE_NAME="${HARBOR_URL}/release/$REPOSITORY:$GITHUB_REF_NAME" IMAGE_NAME="${HARBOR_URL}/$REPOSITORY:$GITHUB_REF_NAME"
echo "Building image: ${IMAGE_NAME}" echo "Building image: ${IMAGE_NAME}"
docker build -t ${IMAGE_NAME} . docker build -t ${IMAGE_NAME} .
echo "Pushing image: ${IMAGE_NAME}" echo "Pushing image: ${IMAGE_NAME}"
docker push ${IMAGE_NAME} docker push ${IMAGE_NAME}
echo "Successfully pushed: ${IMAGE_NAME}" echo "Successfully pushed: ${IMAGE_NAME}"
docker rmi ${IMAGE_NAME} docker rmi ${IMAGE_NAME}
echo "cleaned up local image" echo "cleaned up local image"

View File

@@ -1,19 +1,19 @@
FROM harbor.merlin.xin/mirrors/docker.io/alpine/k8s:1.30.4 FROM registry.merlin.xin/alpine/k8s:1.30.4
ENV TZ=Asia/Shanghai \ ENV TZ=Asia/Shanghai \
LANG=C.UTF-8 LANG=C.UTF-8
RUN apk add --no-cache nodejs git curl ca-certificates tar\ RUN apk add --no-cache nodejs git curl ca-certificates tar\
&& update-ca-certificates || true && update-ca-certificates || true
# Install helmfile (adjust version as needed) # Install helmfile (adjust version as needed)
RUN set -eux; \ RUN set -eux; \
curl -fsSL -o /tmp/helmfile.tar.gz "https://github.com/helmfile/helmfile/releases/download/v1.1.9/helmfile_1.1.9_linux_amd64.tar.gz"; \ curl -fsSL -o /tmp/helmfile.tar.gz "https://github.com/helmfile/helmfile/releases/download/v1.1.9/helmfile_1.1.9_linux_amd64.tar.gz"; \
mkdir -p /tmp/helmfile_extract; \ mkdir -p /tmp/helmfile_extract; \
tar -xzf /tmp/helmfile.tar.gz -C /tmp/helmfile_extract; \ tar -xzf /tmp/helmfile.tar.gz -C /tmp/helmfile_extract; \
# find the helmfile binary and move it to /usr/local/bin # find the helmfile binary and move it to /usr/local/bin
find /tmp/helmfile_extract -type f -name helmfile -exec mv {} /usr/local/bin/helmfile \; ; \ find /tmp/helmfile_extract -type f -name helmfile -exec mv {} /usr/local/bin/helmfile \; ; \
chmod +x /usr/local/bin/helmfile; \ chmod +x /usr/local/bin/helmfile; \
rm -rf /tmp/helmfile.tar.gz /tmp/helmfile_extract rm -rf /tmp/helmfile.tar.gz /tmp/helmfile_extract
WORKDIR /workspace WORKDIR /workspace

View File

@@ -1,3 +1,5 @@
# action_dployer # action_dployer for gtea_action
自己构建的action部署镜像依赖chart包来部署应用到rke2集群 用作gitea_action部署应用到k8s集群
包含helm和helmfile