From 9bbacb1f3bdae22b3b15d48a29a514affc7bf54a Mon Sep 17 00:00:00 2001 From: Grace He Date: Thu, 15 Jan 2026 11:02:23 +0800 Subject: [PATCH] update images --- .github/workflows/build.main.yml | 14 ++++++++------ images/Dockerfile | 10 +++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.main.yml b/.github/workflows/build.main.yml index 54b82ed..8ff3698 100644 --- a/.github/workflows/build.main.yml +++ b/.github/workflows/build.main.yml @@ -6,8 +6,8 @@ on: - main paths: # '*' matches any character except '/' - - 'images/*' - - '.github/workflows/*' + - "images/*" + - ".github/workflows/*" jobs: build: runs-on: ubuntu-latest @@ -15,19 +15,21 @@ jobs: - uses: actions/checkout@v2 - name: Docker login env: - DOCKER_HUB_USERNAME: ${{ secrets. DOCKER_HUB_USERNAME }} + DOCKER_HUB_USERNAME: ${{ secrets. DOCKER_HUB_USERNAME }} DOCKER_HUB_PASSWORD: ${{ secrets. DOCKER_HUB_PASSWORD }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - + run: | echo $DOCKER_HUB_PASSWORD | docker login --username $DOCKER_HUB_USERNAME --password-stdin echo $GITHUB_TOKEN | docker login docker.pkg.github.com --username $GITHUB_ACTOR --password-stdin - + - name: Build & Push Image -- ringcentral/jacoco-tool run: | cd images IMAGE_NAME=ringcentral/jacoco-tool - VERSION="$(awk -F ':' '/FROM ringcentral\/jdk:/ {print $2}' Dockerfile)" + JDK_VERSION="$(awk -F ':' '/FROM ringcentral\/jdk:/ {print $2}' Dockerfile)" + SWAGGER_VERSION="$(awk -F '=' '/ENV SWAGGER_COVERAGE_VERSION=/ {print $2}' Dockerfile)" + VERSION="${JDK_VERSION}-swagger-${SWAGGER_VERSION}" docker build -t ${IMAGE_NAME} -f Dockerfile . docker tag "${IMAGE_NAME}" "${IMAGE_NAME}:latest" docker tag "${IMAGE_NAME}" "${IMAGE_NAME}:${VERSION}" diff --git a/images/Dockerfile b/images/Dockerfile index 50d9fe7..d7f9ddd 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -18,11 +18,11 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # Install swagger-coverage-commandline - -RUN wget https://github.com/xingyu-he/swagger-coverage/releases/download/v1.0.0/swagger-coverage-commandline-1.0-SNAPSHOT.zip \ - && unzip swagger-coverage-commandline-1.0-SNAPSHOT.zip \ - && mv swagger-coverage-commandline-1.0-SNAPSHOT /opt/swagger-coverage \ - && rm swagger-coverage-commandline-1.0-SNAPSHOT.zip \ +ENV SWAGGER_COVERAGE_VERSION=1.1.0 +RUN wget https://github.com/xingyu-he/swagger-coverage/releases/download/v1.1.0/swagger-coverage-commandline-1.1.0.zip \ + && unzip swagger-coverage-commandline-1.1.0.zip \ + && mv swagger-coverage-commandline-1.1.0 /opt/swagger-coverage \ + && rm swagger-coverage-commandline-1.1.0.zip \ && ln -s /opt/swagger-coverage/bin/swagger-coverage-commandline /usr/local/bin/swagger-coverage # Copy jacococli.jar to the image