Merge pull request #50 from LinuxSuRen/push-release-ghcr

Push released ks-jenkins image to ghcr.io as well
kubesphere · Sep 22, 2021 · 8a6f8d0 · 8a6f8d0
2 parents 623907e + 69bca21
commit 8a6f8d0
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 191 deletions.
diff --git a/.github/workflows/Dockerfile-ks-jenkins-cache b/.github/workflows/Dockerfile-ks-jenkins-cache
diff --git a/.github/workflows/build-dev-image.yml b/.github/workflows/build-dev-image.yml
@@ -39,8 +39,6 @@ jobs:
         run: |
           docker login --username ${{ secrets.DOCKER_HUB_USER }} --password ${{secrets.DOCKER_HUB_TOKEN}}
 
-          mkdir -p ~/.m2
-          echo "${{secrets.MVN_SETTINGS}}" > ~/.m2/settings.xml
           curl -L https://github.com/jenkins-zh/jenkins-cli/releases/latest/download/jcli-linux-amd64.tar.gz|tar xzv
 
           export PATH=.:$PATH:phantomjs/bin

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
@@ -52,3 +52,9 @@ jobs:
         run: |
           version=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
           docker push kubespheredev/ks-jenkins:$version
+      - name: Push Image ghcr.io
+        run: |
+          version=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
+          docker login ghcr.io --username ${{ secrets.GH_USER }} --password ${{secrets.GH_TOKEN}}
+          docker tag kubespheredev/ks-jenkins:$version ghcr.io/kubesphere/ks-jenkins:$version
+          docker push ghcr.io/kubesphere/ks-jenkins:$version
diff --git a/.github/workflows/ks-jenkins-cache.yaml b/.github/workflows/ks-jenkins-cache.yaml
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -43,8 +43,6 @@ jobs:
         uses: docker/setup-buildx-action@v1
       - name: Build
         run: |
-          mkdir -p ~/.m2
-          cat .github/workflows/settings.xml | base64 -d > ~/.m2/settings.xml
           curl -L https://github.com/jenkins-zh/jenkins-cli/releases/latest/download/jcli-linux-amd64.tar.gz|tar xzv
           export PATH=.:$PATH:phantomjs/bin
           jcli cwp --install-artifacts --config-path formula.yaml \

diff --git a/.github/workflows/settings.xml b/.github/workflows/settings.xml