diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 358321a..a303758 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,35 +1,35 @@ -name: Docker Image CI -on: - push: - branches: - - dev - -jobs: - build: - runs-on: gitea-runner-group-blog - 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-runner-group-blog + container: + image: ${{ vars.HARBOR_URL }}/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/$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 55f1234..dca63a9 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-runner-group-blog - 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-runner-group-blog + container: + image: ${{ vars.HARBOR_URL }}/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}/$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 a7a75b2..5d0e4a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM harbor.merlin.xin/mirrors/docker.io/library/node:20-bullseye AS build +FROM registry.merlin.xin/library/node:20-bullseye AS build WORKDIR /app @@ -12,6 +12,6 @@ COPY . . RUN npm run build -FROM harbor.merlin.xin/mirrors/docker.io/library/nginxinc/nginx-unprivileged:stable +FROM registry.merlin.xin/mirrors/nginxinc/nginx-unprivileged:stable COPY --from=build /app/dist /app/dist \ No newline at end of file