diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index be17ec3..67a59a7 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -1,36 +1,36 @@ -name: Docker Image CI -on: - push: - branches: - - dev - -jobs: - build: - runs-on: gitea-official-runner - container: - image: harbor.merlin.xin/release/merlin/action_builder:v0.0.1 - steps: - - name: Checkout code - uses: actions/checkout@v4 - - name: docker login - env: - HARBOR_USERNAME: ${{ secrets.HARBOR_ROBOT }} - HARBOR_PASSWORD: ${{ secrets.HARBOR_ROBOT_SECRET }} - HARBOR_URL: ${{ vars.HARBOR_URL }} - run: docker login ${HARBOR_URL} -u ${HARBOR_USERNAME} -p ${HARBOR_PASSWORD} - - name: Build and push Docker images - env: - HARBOR_URL: ${{ vars.HARBOR_URL }} - TAG: ${{ github.sha }} - REPOSITORY: ${{ github.repository }} - run: | - ROOT_DIR=$(pwd) - IMAGE_NAME="${HARBOR_URL}/testing/$REPOSITORY:${TAG}" - echo "Building image: ${IMAGE_NAME}" - docker build -t ${IMAGE_NAME} . - echo "Pushing image: ${IMAGE_NAME}" - docker push ${IMAGE_NAME} - echo "Successfully pushed: ${IMAGE_NAME}" - docker rmi ${IMAGE_NAME} - echo "cleaned up local image" - +name: Docker Image CI +on: + push: + branches: + - dev + +jobs: + build: + runs-on: gitea-official-runner + container: + image: registry.merlin.xin/candlelight/action_builder:v0.0.1 + steps: + - name: Checkout code + uses: actions/checkout@v4 + - name: docker login + env: + HARBOR_USERNAME: ${{ secrets.HARBOR_ROBOT }} + HARBOR_PASSWORD: ${{ secrets.HARBOR_ROBOT_SECRET }} + HARBOR_URL: ${{ vars.HARBOR_URL }} + run: docker login ${HARBOR_URL} -u ${HARBOR_USERNAME} -p ${HARBOR_PASSWORD} + - name: Build and push Docker images + env: + HARBOR_URL: ${{ vars.HARBOR_URL }} + TAG: ${{ github.sha }} + REPOSITORY: ${{ github.repository }} + run: | + ROOT_DIR=$(pwd) + IMAGE_NAME="${HARBOR_URL}/testing/candlelight/$REPOSITORY:${TAG}" + echo "Building image: ${IMAGE_NAME}" + docker build -t ${IMAGE_NAME} . + echo "Pushing image: ${IMAGE_NAME}" + docker push ${IMAGE_NAME} + echo "Successfully pushed: ${IMAGE_NAME}" + docker rmi ${IMAGE_NAME} + echo "cleaned up local image" + diff --git a/.gitea/workflows/tag.yaml b/.gitea/workflows/tag.yaml index 1f70955..aeefb36 100644 --- a/.gitea/workflows/tag.yaml +++ b/.gitea/workflows/tag.yaml @@ -1,34 +1,34 @@ -name: Docker Image CI -on: - push: - tags: - - '*' - -jobs: - build: - runs-on: gitea-official-runner - container: - image: harbor.merlin.xin/release/merlin/action_builder:v0.0.1 - steps: - - name: Checkout code - uses: actions/checkout@v4 - - name: docker login - env: - HARBOR_USERNAME: ${{ secrets.HARBOR_ROBOT }} - HARBOR_PASSWORD: ${{ secrets.HARBOR_ROBOT_SECRET }} - HARBOR_URL: ${{ vars.HARBOR_URL }} - run: docker login ${HARBOR_URL} -u ${HARBOR_USERNAME} -p ${HARBOR_PASSWORD} - - name: Build and push Docker images - env: - HARBOR_URL: ${{ vars.HARBOR_URL }} - REPOSITORY: ${{ github.repository }} - run: | - ROOT_DIR=$(pwd) - IMAGE_NAME="${HARBOR_URL}/release/$REPOSITORY:$GITHUB_REF_NAME" - echo "Building image: ${IMAGE_NAME}" - docker build -t ${IMAGE_NAME} . - echo "Pushing image: ${IMAGE_NAME}" - docker push ${IMAGE_NAME} - echo "Successfully pushed: ${IMAGE_NAME}" - docker rmi ${IMAGE_NAME} - echo "cleaned up local image" +name: Docker Image CI +on: + push: + tags: + - '*' + +jobs: + build: + runs-on: gitea-official-runner + container: + image: registry.merlin.xin/candlelight/action_builder:v0.0.1 + steps: + - name: Checkout code + uses: actions/checkout@v4 + - name: docker login + env: + HARBOR_USERNAME: ${{ secrets.HARBOR_ROBOT }} + HARBOR_PASSWORD: ${{ secrets.HARBOR_ROBOT_SECRET }} + HARBOR_URL: ${{ vars.HARBOR_URL }} + run: docker login ${HARBOR_URL} -u ${HARBOR_USERNAME} -p ${HARBOR_PASSWORD} + - name: Build and push Docker images + env: + HARBOR_URL: ${{ vars.HARBOR_URL }} + REPOSITORY: ${{ github.repository }} + run: | + ROOT_DIR=$(pwd) + IMAGE_NAME="${HARBOR_URL}/candlelight/$REPOSITORY:$GITHUB_REF_NAME" + echo "Building image: ${IMAGE_NAME}" + docker build -t ${IMAGE_NAME} . + echo "Pushing image: ${IMAGE_NAME}" + docker push ${IMAGE_NAME} + echo "Successfully pushed: ${IMAGE_NAME}" + docker rmi ${IMAGE_NAME} + echo "cleaned up local image" diff --git a/Dockerfile b/Dockerfile index 2e15977..8c1f8c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM harbor.merlin.xin/mirrors/docker.io/library/docker:24.0.6-dind - -# 安装 Node.js -RUN apk add --no-cache bash curl git nodejs npm - -# 安装 helm CLI -RUN curl -fsSL https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz -o helm.tar.gz \ - && tar -zxvf helm.tar.gz \ - && mv linux-amd64/helm /usr/local/bin/helm \ - && rm -rf linux-amd64 helm.tar.gz - -WORKDIR /workspace - +FROM registry.merlin.xin/library/docker:24.0.6-dind + +# 安装 Node.js +RUN apk add --no-cache bash curl git nodejs npm + +# 安装 helm CLI +RUN curl -fsSL https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz -o helm.tar.gz \ + && tar -zxvf helm.tar.gz \ + && mv linux-amd64/helm /usr/local/bin/helm \ + && rm -rf linux-amd64 helm.tar.gz + +WORKDIR /workspace + ENTRYPOINT [ "/bin/bash" ] \ No newline at end of file diff --git a/README.md b/README.md index 459a2ec..26fe8ef 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -# action_builder - -自己构建的一个方便使用的docker构建器 - -他一定不是最快的,但是一定是最方便、最直观的 \ No newline at end of file +# action_builder for gitea_action + +全量的镜像构建器,可以独立构建应用镜像和chart包 \ No newline at end of file