@@ -41,13 +41,13 @@ jobs:
4141 tags : bde2020/spark-base:${{env.DOCKER_IMAGE_TAG}}
4242 push : ${{ github.event_name != 'pull_request' }}
4343
44- master_worker_submit :
44+ master_worker :
4545 runs-on : ubuntu-latest
4646
4747 strategy :
4848 fail-fast : false
4949 matrix :
50- base : [master, worker, submit ]
50+ image : [master, worker]
5151
5252 needs : ' base'
5353 steps :
@@ -75,13 +75,56 @@ jobs:
7575 [ "$IMAGE_TAG" == "master" ] && IMAGE_TAG=latest
7676 echo "DOCKER_IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
7777
78- - name : Build and push Spark maser, worker and submit image
78+ - name : Build and push Spark maser and worker image
7979 id : docker_build_maser_worker_submit_image
8080 uses : docker/build-push-action@v2
8181 with :
82- context : ${{ matrix.base }}
83- file : ${{ matrix.base }}/Dockerfile
84- tags : bde2020/spark-${{ matrix.base }}:${{env.DOCKER_IMAGE_TAG}}
82+ context : ${{ matrix.image }}
83+ file : ${{ matrix.image }}/Dockerfile
84+ tags : bde2020/spark-${{ matrix.image }}:${{env.DOCKER_IMAGE_TAG}}
85+ push : ${{ github.event_name != 'pull_request' }}
86+
87+ submit :
88+ runs-on : ubuntu-latest
89+
90+ strategy :
91+ fail-fast : false
92+ matrix :
93+ image : [submit]
94+
95+ needs : ' base'
96+ steps :
97+
98+ - name : Check Out Repo
99+ uses : actions/checkout@v2
100+
101+ - name : Login to Docker Hub
102+ uses : docker/login-action@v1
103+ with :
104+ username : ${{ secrets.DOCKERHUB_USERNAME }}
105+ password : ${{ secrets.DOCKERHUB_TOKEN }}
106+
107+ - name : Set up Docker Buildx
108+ id : buildx
109+ uses : docker/setup-buildx-action@v1
110+
111+ - name : Get branch names
112+ id : branch-name
113+ uses : tj-actions/branch-names@v5
114+
115+ - name : Sets env vars for image_tag
116+ run : |
117+ IMAGE_TAG=${{ steps.branch-name.outputs.current_branch }}
118+ [ "$IMAGE_TAG" == "master" ] && IMAGE_TAG=latest
119+ echo "DOCKER_IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
120+
121+ - name : Build and push Spark submit image
122+ id : docker_build_maser_worker_submit_image
123+ uses : docker/build-push-action@v2
124+ with :
125+ context : ${{ matrix.image }}
126+ file : ${{ matrix.image }}/Dockerfile
127+ tags : bde2020/spark-${{ matrix.image }}:${{env.DOCKER_IMAGE_TAG}}
85128 push : ${{ github.event_name != 'pull_request' }}
86129
87130 template :
92135 matrix :
93136 template : [java, scala, python]
94137
95- needs : ' base '
138+ needs : ' submit '
96139 steps :
97140
98141 - name : Check Out Repo
@@ -125,4 +168,4 @@ jobs:
125168 context : template/${{ matrix.template }}
126169 file : template/${{ matrix.template }}/Dockerfile
127170 tags : bde2020/spark-${{ matrix.template }}-template:${{env.DOCKER_IMAGE_TAG}}
128- push : ${{ github.event_name != 'pull_request' }}
171+ push : ${{ github.event_name != 'pull_request' }}
0 commit comments