Add build base image step in build package git action workflow

Build base image step should be in build package workflow, and local base images build by new step should be removed since images have been pushed to docker hub. Signed-off-by: danfengliu <[email protected]>
xaleeks · Apr 17, 2021 · f0ebd17 · f0ebd17
1 parent 5f0e7cf
commit f0ebd17
Show file tree

Hide file tree

Showing 86 changed files with 9,825 additions and 9,793 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml
@@ -1,111 +1,128 @@
-name: "Build Package Workflow"
-env:
-  DOCKER_COMPOSE_VERSION: 1.23.0
-
-on:
-    push:
-        branches:
-          - master
-          - release-*
-        tags:
-          - v*
-jobs:
-  BUILD_PACKAGE:
-    env:
-        BUILD_PACKAGE: true
-    runs-on:
-      #- self-hosted
-      - ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
-        with:
-          version: '285.0.0'
-          project_id: ${{ secrets.GCP_PROJECT_ID }}
-          service_account_email: ${{ secrets.GCP_SA_EMAIL }}
-          service_account_key: ${{ secrets.GCP_SA_KEY }}
-          export_default_credentials: true
-      - run: gcloud info
-      - name: Set up Go 1.14
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.15.6
-        id: go
-      - name: setup Docker
-        uses: docker-practice/[email protected]
-        with:
-          docker_version: 18.09
-          docker_channel: stable
-      - uses: actions/checkout@v2
-        with:
-          path: src/github.com/goharbor/harbor
-      - name: Build Package
-        run: |
-          set -x
-          env
-          df -h
-          harbor_target_bucket=""
-          target_branch="$(echo ${GITHUB_REF#refs/heads/})"
-          harbor_offline_build_bundle=""
-          harbor_online_build_bundle=""
-          harbor_logs_bucket="harbor-ci-logs"
-          harbor_builds_bucket="harbor-builds"
-          harbor_releases_bucket="harbor-releases"
-          harbor_ci_pipeline_store_bucket="harbor-ci-pipeline-store/latest"
-          # the target release version is the version of next release(RC or GA). It needs to be updated on creating new release branch.
-          target_release_version=$(cat ./VERSION)
-          Harbor_Package_Version=$target_release_version-'build.'$GITHUB_RUN_NUMBER
-
-          if [[ $target_branch == "master" ]]; then
-            Harbor_Assets_Version=$Harbor_Package_Version
-          else
-            Harbor_Assets_Version=$target_release_version
-          fi
-
-          if [[ $target_branch == "release-"* ]]; then
-            Harbor_Build_Base_Tag=$target_release_version
-          else
-            Harbor_Build_Base_Tag=dev
-          fi
-
-          if [[ $target_branch == "master" ]]; then
-            harbor_target_bucket=$harbor_builds_bucket
-          else
-            harbor_target_bucket=$harbor_releases_bucket/$target_branch
-          fi
-
-          cd src/github.com/goharbor/harbor
-          sudo make package_offline GOBUILDTAGS="include_oss include_gcs" BASEIMAGETAG=${Harbor_Build_Base_Tag} VERSIONTAG=${Harbor_Assets_Version} PKGVERSIONTAG=${Harbor_Package_Version} BUILDBIN=true NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY=
-          sudo make package_online GOBUILDTAGS="include_oss include_gcs" BASEIMAGETAG=${Harbor_Build_Base_Tag} VERSIONTAG=${Harbor_Assets_Version} PKGVERSIONTAG=${Harbor_Package_Version} BUILDBIN=true NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY=
-          harbor_offline_build_bundle=$(basename harbor-offline-installer-*.tgz)
-          harbor_online_build_bundle=$(basename harbor-online-installer-*.tgz)
-          echo "Package name is: $harbor_offline_build_bundle"
-          echo "Package name is: $harbor_online_build_bundle"
-
-          echo -en "${{ secrets.HARBOR_SIGN_KEY }}" |  gpg --import
-          gpg -v -ab -u ${{ secrets.HARBOR_SIGN_KEY_ID }} $harbor_offline_build_bundle
-          gpg -v -ab -u ${{ secrets.HARBOR_SIGN_KEY_ID }} $harbor_online_build_bundle
-
-          source tests/ci/build_util.sh
-          cp ${harbor_offline_build_bundle}                 harbor-offline-installer-latest.tgz
-          cp ${harbor_offline_build_bundle}.asc             harbor-offline-installer-latest.tgz.asc
-          uploader ${harbor_offline_build_bundle}           $harbor_target_bucket
-          uploader ${harbor_offline_build_bundle}.asc       $harbor_target_bucket
-          uploader ${harbor_online_build_bundle}            $harbor_target_bucket
-          uploader ${harbor_online_build_bundle}.asc        $harbor_target_bucket
-          uploader harbor-offline-installer-latest.tgz      $harbor_target_bucket
-          uploader harbor-offline-installer-latest.tgz.asc  $harbor_target_bucket
-          echo "BUILD_BUNDLE=$harbor_offline_build_bundle" >> $GITHUB_ENV
-
-          publishImage $target_branch $Harbor_Assets_Version "${{ secrets.DOCKER_HUB_USERNAME }}" "${{ secrets.DOCKER_HUB_PASSWORD }}"
-
-      - name: Slack Notification
-        uses: sonots/slack-notice-action@v3
-        with:
-          status: ${{ job.status }}
-          title: Build Package - ${{ env.BUILD_BUNDLE }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
-        if: always()
-
+name: "Build Package Workflow"
+env:
+  DOCKER_COMPOSE_VERSION: 1.23.0
+
+on:
+    push:
+        branches:
+          - master
+          - release-*
+        tags:
+          - v*
+jobs:
+  BUILD_PACKAGE:
+    env:
+        BUILD_PACKAGE: true
+    runs-on:
+      #- self-hosted
+      - ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+        with:
+          version: '285.0.0'
+          project_id: ${{ secrets.GCP_PROJECT_ID }}
+          service_account_email: ${{ secrets.GCP_SA_EMAIL }}
+          service_account_key: ${{ secrets.GCP_SA_KEY }}
+          export_default_credentials: true
+      - run: gcloud info
+      - name: Set up Go 1.14
+        uses: actions/setup-go@v1
+        with:
+          go-version: 1.15.6
+        id: go
+      - name: setup Docker
+        uses: docker-practice/[email protected]
+        with:
+          docker_version: 18.09
+          docker_channel: stable
+      - uses: actions/[email protected]
+      - uses: jitterbit/get-changed-files@v1
+        id: changed-files
+        with:
+          format: space-delimited
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v2
+        with:
+          path: src/github.com/goharbor/harbor
+      - name: Build Dev Base Image
+        if: contains(steps.changed-files.outputs.modified, 'Dockerfile.base') && contains(github.ref, 'master')
+        run: |
+          set -x
+          base_image_tag=$(cat ./VERSION)
+          echo "Start to build base image for dev ......"
+          cd src/github.com/goharbor/harbor
+          sudo make build_base_docker -e BASEIMAGETAG=$base_image_tag -e REGISTRYUSER="${{ secrets.DOCKER_HUB_USERNAME }}" -e REGISTRYPASSWORD="${{ secrets.DOCKER_HUB_PASSWORD }}" -e PUSHBASEIMAGE=yes
+      - name: Build Release Base Image
+        if: contains(steps.changed-files.outputs.modified, 'VERSION')
+        run: |
+          set -x
+          base_image_tag=$(cat ./VERSION)
+          echo "Start to build base image for release $(base_image_tag) ......"
+          cd src/github.com/goharbor/harbor
+          sudo make build_base_docker -e BASEIMAGETAG=$base_image_tag -e REGISTRYUSER="${{ secrets.DOCKER_HUB_USERNAME }}" -e REGISTRYPASSWORD="${{ secrets.DOCKER_HUB_PASSWORD }}" -e PUSHBASEIMAGE=yes
+      - name: Build Package
+        run: |
+          set -x
+          env
+          df -h
+          harbor_target_bucket=""
+          target_branch="$(echo ${GITHUB_REF#refs/heads/})"
+          harbor_offline_build_bundle=""
+          harbor_online_build_bundle=""
+          harbor_logs_bucket="harbor-ci-logs"
+          harbor_builds_bucket="harbor-builds"
+          harbor_releases_bucket="harbor-releases"
+          harbor_ci_pipeline_store_bucket="harbor-ci-pipeline-store/latest"
+          # the target release version is the version of next release(RC or GA). It needs to be updated on creating new release branch.
+          target_release_version=$(cat ./VERSION)
+          Harbor_Package_Version=$target_release_version-'build.'$GITHUB_RUN_NUMBER
+
+          if [[ $target_branch == "master" ]]; then
+            Harbor_Assets_Version=$Harbor_Package_Version
+            harbor_target_bucket=$harbor_builds_bucket
+          else
+            Harbor_Assets_Version=$target_release_version
+            harbor_target_bucket=$harbor_releases_bucket/$target_branch
+          fi
+
+          if [[ $target_branch == "release-"* ]]; then
+            Harbor_Build_Base_Tag=$target_release_version
+          else
+            Harbor_Build_Base_Tag=dev
+          fi
+
+          cd src/github.com/goharbor/harbor
+          sudo make package_offline GOBUILDTAGS="include_oss include_gcs" BASEIMAGETAG=${Harbor_Build_Base_Tag} VERSIONTAG=${Harbor_Assets_Version} PKGVERSIONTAG=${Harbor_Package_Version} BUILDBIN=true NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY=
+          sudo make package_online GOBUILDTAGS="include_oss include_gcs" BASEIMAGETAG=${Harbor_Build_Base_Tag} VERSIONTAG=${Harbor_Assets_Version} PKGVERSIONTAG=${Harbor_Package_Version} BUILDBIN=true NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY=
+          harbor_offline_build_bundle=$(basename harbor-offline-installer-*.tgz)
+          harbor_online_build_bundle=$(basename harbor-online-installer-*.tgz)
+          echo "Package name is: $harbor_offline_build_bundle"
+          echo "Package name is: $harbor_online_build_bundle"
+
+          echo -en "${{ secrets.HARBOR_SIGN_KEY }}" |  gpg --import
+          gpg -v -ab -u ${{ secrets.HARBOR_SIGN_KEY_ID }} $harbor_offline_build_bundle
+          gpg -v -ab -u ${{ secrets.HARBOR_SIGN_KEY_ID }} $harbor_online_build_bundle
+
+          source tests/ci/build_util.sh
+          cp ${harbor_offline_build_bundle}                 harbor-offline-installer-latest.tgz
+          cp ${harbor_offline_build_bundle}.asc             harbor-offline-installer-latest.tgz.asc
+          uploader ${harbor_offline_build_bundle}           $harbor_target_bucket
+          uploader ${harbor_offline_build_bundle}.asc       $harbor_target_bucket
+          uploader ${harbor_online_build_bundle}            $harbor_target_bucket
+          uploader ${harbor_online_build_bundle}.asc        $harbor_target_bucket
+          uploader harbor-offline-installer-latest.tgz      $harbor_target_bucket
+          uploader harbor-offline-installer-latest.tgz.asc  $harbor_target_bucket
+          echo "BUILD_BUNDLE=$harbor_offline_build_bundle" >> $GITHUB_ENV
+
+          publishImage $target_branch $Harbor_Assets_Version "${{ secrets.DOCKER_HUB_USERNAME }}" "${{ secrets.DOCKER_HUB_PASSWORD }}"
+
+      - name: Slack Notification
+        uses: sonots/slack-notice-action@v3
+        with:
+          status: ${{ job.status }}
+          title: Build Package - ${{ env.BUILD_BUNDLE }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+        if: always()
diff --git a/.gitignore b/.gitignore
@@ -48,3 +48,5 @@ src/core/conf/app.conf
 
 src/server/v2.0/models/
 src/server/v2.0/restapi/
+.editorconfig
+
diff --git a/make/pushimage.sh b/make/pushimage.sh
@@ -112,3 +112,16 @@ if [ $? -ne 0 ];then
 else
   success "Pushing image $IMAGE succeeded";
 fi
+
+h2 "Remove local goharbor images"
+DOCKER_RMI="docker rmi -f $(docker images | grep "goharbor" | awk '{print $3}')"
+info "$DOCKER_RMI"
+DOCKER_RMI_OUTPUT=$($DOCKER_RMI)
+
+if [ $? -ne 0 ];then
+  warn $DOCKER_RMI_OUTPUT
+  error "Clean local goharbor images failed";
+else
+  success "Clean local goharbor images succeeded";
+fi
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -48,3 +48,5 @@ src/core/conf/app.conf

		src/server/v2.0/models/
		src/server/v2.0/restapi/
		.editorconfig