Skip to content

Commit 2e1dce1

Browse files
modify workflow to improve
1 parent c659e2e commit 2e1dce1

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

.github/workflows/build-publish-jenkins-image.yaml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,31 +46,21 @@ jobs:
4646
with:
4747
push: true
4848
platforms: linux/amd64,linux/arm64
49-
tags: ${{ secrets.DOCKERHUB_USERNAME }}/jenkins-core-image:${{ env.NEW_VERSION }}
49+
tags: |
50+
${{ secrets.DOCKERHUB_USERNAME }}/jenkins-core-image:${{ env.NEW_VERSION }}
51+
${{ secrets.DOCKERHUB_USERNAME }}/jenkins-core-image:latest
5052
build-args: |
5153
"JENKINS_USER=${{ secrets.JENKINS_USER }}"
5254
"JENKINS_PASS=${{ secrets.JENKINS_PASS }}"
5355
"GITHUB_APP_KEY=${{ secrets.GH_APP_KEY }}"
54-
"GITHUB_APP_ID=${{ secrets.GH_APP_ID }}"
55-
56-
- name: Build and Publish docker image with latest tag
57-
uses: docker/build-push-action@v5
58-
with:
59-
push: true
60-
platforms: linux/amd64,linux/arm64
61-
tags: ${{ secrets.DOCKERHUB_USERNAME }}/jenkins-core-image:latest
62-
build-args: |
63-
"JENKINS_USER=${{ secrets.JENKINS_USER }}"
64-
"JENKINS_PASS=${{ secrets.JENKINS_PASS }}"
65-
"GITHUB_APP_KEY=${{ secrets.GH_APP_KEY }}"
66-
"GITHUB_APP_ID=${{ secrets.GH_APP_ID }}"
56+
"GITHUB_APP_ID=${{ secrets.GH_APP_ID }}"
6757
6858
- name: set up docker and scan docker image for vulnerabilities
6959
uses: docker-practice/actions-setup-docker@master
7060
- run: |
7161
set -x
7262
docker version
73-
docker run -v /var/run/docker.sock:/var/run/docker.sock aquasec/trivy image ${{ secrets.DOCKERHUB_USERNAME }}/jenkins-core-image:latest
63+
docker run -v /var/run/docker.sock:/var/run/docker.sock aquasec/trivy image ${{ secrets.DOCKERHUB_USERNAME }}/jenkins-core-image:latest
7464
7565
- name: Set job end time
7666
run: echo "JOB_END_TIME=$(date -u +"%d %B %A %Y %H:%M UTC")" >> $GITHUB_ENV

0 commit comments

Comments
 (0)