From 128537c34571bbc0d33cc1433623aa960fed9529 Mon Sep 17 00:00:00 2001 From: Morlay Date: Fri, 16 Jun 2023 18:58:44 +0800 Subject: [PATCH] v2.8.2 --- .github/workflows/docker-publish-images.yml | 144 ++++++++++---------- harbor | 2 +- version | 2 +- 3 files changed, 73 insertions(+), 75 deletions(-) diff --git a/.github/workflows/docker-publish-images.yml b/.github/workflows/docker-publish-images.yml index 4fead65..11d8910 100644 --- a/.github/workflows/docker-publish-images.yml +++ b/.github/workflows/docker-publish-images.yml @@ -6,69 +6,68 @@ on: - 'main' jobs: - docker-base-image: - runs-on: ubuntu-latest - strategy: - matrix: - component: - - chartserver - - trivy-adapter - - core - - db - - exporter - - jobservice - - log - - nginx - - notary-server - - notary-signer - - portal - - prepare - - redis - - registry - - registryctl - - defaults: - run: - working-directory: ./harbor - - steps: - - uses: actions/checkout@v3 - with: - submodules: true - - - uses: docker/setup-qemu-action@v2 - - uses: docker/setup-buildx-action@v2 - with: - driver: docker-container - driver-opts: network=host - - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - run: cd .. && make patch - - - id: prepare - run: echo "tag=$(cat ../version)" >> $GITHUB_ENV - - - name: Build base image - uses: docker/build-push-action@v3 - with: - context: ./harbor - file: ./harbor/make/photon/${{ matrix.component }}/Dockerfile.base - platforms: linux/amd64,linux/arm64 - labels: | - org.opencontainers.image.source=https://github.com/${{ github.repository }} - org.opencontainers.image.revision=${{ env.tag }} - push: ${{ github.event_name != 'pull_request' }} - tags: ghcr.io/${{ github.repository }}/harbor-${{ matrix.component }}-base:${{ env.tag }} + # docker-base-image: + # runs-on: ubuntu-latest + # strategy: + # matrix: + # component: + # - trivy-adapter + # - core + # - db + # - exporter + # - jobservice + # - log + # - nginx + # - notary-server + # - notary-signer + # - portal + # - prepare + # - redis + # - registry + # - registryctl + # + # defaults: + # run: + # working-directory: ./harbor + # + # steps: + # - uses: actions/checkout@v3 + # with: + # submodules: true + # + # - uses: docker/setup-qemu-action@v2 + # - uses: docker/setup-buildx-action@v2 + # with: + # driver: docker-container + # driver-opts: network=host + # - uses: docker/login-action@v2 + # with: + # registry: ghcr.io + # username: ${{ github.actor }} + # password: ${{ secrets.GITHUB_TOKEN }} + # + # - run: cd .. && make patch + # + # - id: prepare + # run: echo "tag=$(cat ../version)" >> $GITHUB_ENV + # + # - name: Build base image + # uses: docker/build-push-action@v3 + # with: + # context: ./harbor + # file: ./harbor/make/photon/${{ matrix.component }}/Dockerfile.base + # platforms: linux/amd64,linux/arm64 + # labels: | + # org.opencontainers.image.source=https://github.com/${{ github.repository }} + # org.opencontainers.image.revision=${{ env.tag }} + # push: ${{ github.event_name != 'pull_request' }} + # tags: ghcr.io/${{ github.repository }}/harbor-${{ matrix.component }}-base:${{ env.tag }} docker-image: - needs: - - docker-base-image + # needs: + # - docker-base-image - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest strategy: fail-fast: false @@ -85,7 +84,6 @@ jobs: - notary - trivy_adapter - redis - - chart_server - standalone_db_migrator - exporter @@ -100,7 +98,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: '^1.17' + go-version: '^1.20.x' - uses: docker/setup-qemu-action@v2 - uses: docker/setup-buildx-action@v2 @@ -108,14 +106,14 @@ jobs: driver: docker-container driver-opts: network=host + - run: cd .. && make patch + - uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - run: cd .. && make patch - - id: prepare run: echo "tag=$(cat ../version)" >> $GITHUB_ENV @@ -133,18 +131,18 @@ jobs: CTX="BUILDBIN=true VERSIONTAG=${{ env.tag }} BASEIMAGETAG=${{ env.tag }} MULTIARCH=${MULTIARCH} IMAGENAMESPACE=${IMAGENAMESPACE} BASEIMAGENAMESPACE=${BASEIMAGENAMESPACE} TRIVYFLAG=${TRIVYFLAG} CHARTFLAG=${CHARTFLAG} NOTARYFLAG=${CHARTFLAG} IMAGELABELS=${IMAGELABELS}" - sudo make versions_prepare ${CTX}; + make versions_prepare ${CTX}; case ${{ matrix.component }} in - core) sudo make compile_core ${CTX} ;; - jobservice) sudo make compile_jobservice ${CTX};; - registryctl) sudo make compile_registryctl ${CTX};; - notary*) sudo make compile_notary_migrate_patch ${CTX} ;; - standalone_db_migrator) sudo make compile_standalone_db_migrator ${CTX} ;; + core) make compile_core ${CTX} ;; + jobservice) make compile_jobservice ${CTX};; + registryctl) make compile_registryctl ${CTX};; + notary*) make compile_notary_migrate_patch ${CTX} ;; + standalone_db_migrator) make compile_standalone_db_migrator ${CTX} ;; esac; case ${{ matrix.component }} in - exporter) sudo make build BUILDTARGET="_compile_and_build_exporter" ${CTX} ;; - registryctl) sudo make build BUILDTARGET="_build_registry _build_registryctl" ${CTX} ;; - *) sudo make build BUILDTARGET="_build_${{ matrix.component }}" ${CTX} ;; + exporter) make build BUILDTARGET="_compile_and_build_exporter" ${CTX} ;; + registryctl) make build BUILDTARGET="_build_registry _build_registryctl" ${CTX} ;; + *) make build BUILDTARGET="_build_${{ matrix.component }}" ${CTX} ;; esac; diff --git a/harbor b/harbor index 6113469..d4c34dc 160000 --- a/harbor +++ b/harbor @@ -1 +1 @@ -Subproject commit 6113469a567623054a58d0f5506b90a55adca7ff +Subproject commit d4c34dcca338e58226e01df92c17bd493ca41388 diff --git a/version b/version index 5c9dc9d..4f00f11 100644 --- a/version +++ b/version @@ -1 +1 @@ -v2.7.0 \ No newline at end of file +v2.8.2 \ No newline at end of file