Skip to content

Commit 4d5709d

Browse files
andre-marcos-perezandre-marcos-perez
authored
Merge pull request #58 from cluster-apps-on-docker/staging
Master v1.2.1 | try #2
2 parents 93e7910 + 9108a0d commit 4d5709d

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

‎.github/workflows/ci.yml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
env:
3030
SCALA_VERSION: "2.12.10"
3131
run: |
32+
echo "${GITHUB_REF}"
3233
cd ${GITHUB_WORKSPACE}/build
3334
docker build \
3435
--build-arg build_date="$(date -u +'%Y-%m-%d')" \
@@ -61,9 +62,9 @@ jobs:
6162
-t spark-master:${SPARK_VERSION} .
6263
echo ${DOCKERHUB_PWD} | docker login -u ${DOCKERHUB_USR} --password-stdin
6364
docker tag spark-master:${SPARK_VERSION} ${DOCKERHUB_USR}/spark-master:${SPARK_VERSION}
64-
if [ "${GITHUB_REF}" == "master" ]; then docker push ${DOCKERHUB_USR}/spark-master:${SPARK_VERSION}; fi
65+
if [ "${GITHUB_REF}" == "refs/heads/master" ]; then docker push ${DOCKERHUB_USR}/spark-master:${SPARK_VERSION}; fi
6566
docker tag spark-master:${SPARK_VERSION} ${DOCKERHUB_USR}/spark-master:latest
66-
if [ "${GITHUB_REF}" == "master" ]; then docker push ${DOCKERHUB_USR}/spark-master:latest; fi
67+
if [ "${GITHUB_REF}" == "refs/heads/master" ]; then docker push ${DOCKERHUB_USR}/spark-master:latest; fi
6768
6869
- name: Build & Push Spark Worker Image - Spark v3.0.0 (latest)
6970
env:
@@ -77,14 +78,15 @@ jobs:
7778
-t spark-worker:${SPARK_VERSION} .
7879
echo ${DOCKERHUB_PWD} | docker login -u ${DOCKERHUB_USR} --password-stdin
7980
docker tag spark-worker:${SPARK_VERSION} ${DOCKERHUB_USR}/spark-worker:${SPARK_VERSION}
80-
if [ "${GITHUB_REF}" == "master" ]; then docker push ${DOCKERHUB_USR}/spark-worker:${SPARK_VERSION}; fi
81+
if [ "${GITHUB_REF}" == "refs/heads/master" ]; then docker push ${DOCKERHUB_USR}/spark-worker:${SPARK_VERSION}; fi
8182
docker tag spark-worker:${SPARK_VERSION} ${DOCKERHUB_USR}/spark-worker:latest
82-
if [ "${GITHUB_REF}" == "master" ]; then docker push ${DOCKERHUB_USR}/spark-worker:latest; fi
83+
if [ "${GITHUB_REF}" == "refs/heads/master" ]; then docker push ${DOCKERHUB_USR}/spark-worker:latest; fi
8384
8485
- name: Build Base Image - Scala v2.11.12
8586
env:
8687
SCALA_VERSION: "2.11.12"
8788
run: |
89+
echo "${GITHUB_REF}"
8890
cd ${GITHUB_WORKSPACE}/build
8991
docker build \
9092
--build-arg build_date="$(date -u +'%Y-%m-%d')" \
@@ -117,7 +119,7 @@ jobs:
117119
-t spark-master:${SPARK_VERSION} .
118120
echo ${DOCKERHUB_PWD} | docker login -u ${DOCKERHUB_USR} --password-stdin
119121
docker tag spark-master:${SPARK_VERSION} ${DOCKERHUB_USR}/spark-master:${SPARK_VERSION}
120-
if [ "${GITHUB_REF}" == "master" ]; then docker push ${DOCKERHUB_USR}/spark-master:${SPARK_VERSION}; fi
122+
if [ "${GITHUB_REF}" == "refs/heads/master" ]; then docker push ${DOCKERHUB_USR}/spark-master:${SPARK_VERSION}; fi
121123
122124
- name: Build & Push Spark Worker Image - Spark v2.4.4
123125
env:
@@ -131,7 +133,7 @@ jobs:
131133
-t spark-worker:${SPARK_VERSION} .
132134
echo ${DOCKERHUB_PWD} | docker login -u ${DOCKERHUB_USR} --password-stdin
133135
docker tag spark-worker:${SPARK_VERSION} ${DOCKERHUB_USR}/spark-worker:${SPARK_VERSION}
134-
if [ "${GITHUB_REF}" == "master" ]; then docker push ${DOCKERHUB_USR}/spark-worker:${SPARK_VERSION}; fi
136+
if [ "${GITHUB_REF}" == "refs/heads/master" ]; then docker push ${DOCKERHUB_USR}/spark-worker:${SPARK_VERSION}; fi
135137
136138
- name: Build Spark Base Image - Spark v2.4.0
137139
env:
@@ -158,7 +160,7 @@ jobs:
158160
-t spark-master:${SPARK_VERSION} .
159161
echo ${DOCKERHUB_PWD} | docker login -u ${DOCKERHUB_USR} --password-stdin
160162
docker tag spark-master:${SPARK_VERSION} ${DOCKERHUB_USR}/spark-master:${SPARK_VERSION}
161-
if [ "${GITHUB_REF}" == "master" ]; then docker push ${DOCKERHUB_USR}/spark-master:${SPARK_VERSION}; fi
163+
if [ "${GITHUB_REF}" == "refs/heads/master" ]; then docker push ${DOCKERHUB_USR}/spark-master:${SPARK_VERSION}; fi
162164
163165
- name: Build & Push Spark Worker Image - Spark v2.4.0
164166
env:
@@ -172,7 +174,7 @@ jobs:
172174
-t spark-worker:${SPARK_VERSION} .
173175
echo ${DOCKERHUB_PWD} | docker login -u ${DOCKERHUB_USR} --password-stdin
174176
docker tag spark-worker:${SPARK_VERSION} ${DOCKERHUB_USR}/spark-worker:${SPARK_VERSION}
175-
if [ "${GITHUB_REF}" == "master" ]; then docker push ${DOCKERHUB_USR}/spark-worker:${SPARK_VERSION}; fi
177+
if [ "${GITHUB_REF}" == "refs/heads/master" ]; then docker push ${DOCKERHUB_USR}/spark-worker:${SPARK_VERSION}; fi
176178
177179
jupyterlab-images:
178180

@@ -192,6 +194,7 @@ jobs:
192194
env:
193195
SCALA_VERSION: "2.12.10"
194196
run: |
197+
echo "${GITHUB_REF}"
195198
cd ${GITHUB_WORKSPACE}/build
196199
docker build \
197200
--build-arg build_date="$(date -u +'%Y-%m-%d')" \
@@ -216,14 +219,15 @@ jobs:
216219
-t jupyterlab:${JUPYTERLAB_VERSION}-spark-${SPARK_VERSION} .
217220
echo ${DOCKERHUB_PWD} | docker login -u ${DOCKERHUB_USR} --password-stdin
218221
docker tag jupyterlab:${JUPYTERLAB_VERSION}-spark-${SPARK_VERSION} ${DOCKERHUB_USR}/jupyterlab:${JUPYTERLAB_VERSION}-spark-${SPARK_VERSION}
219-
if [ "${GITHUB_REF}" == "master" ]; then docker push ${DOCKERHUB_USR}/jupyterlab:${JUPYTERLAB_VERSION}-spark-${SPARK_VERSION}; fi
222+
if [ "${GITHUB_REF}" == "refs/heads/master" ]; then docker push ${DOCKERHUB_USR}/jupyterlab:${JUPYTERLAB_VERSION}-spark-${SPARK_VERSION}; fi
220223
docker tag jupyterlab:${JUPYTERLAB_VERSION}-spark-${SPARK_VERSION} ${DOCKERHUB_USR}/jupyterlab:latest
221-
if [ "${GITHUB_REF}" == "master" ]; then docker push ${DOCKERHUB_USR}/jupyterlab:latest; fi
224+
if [ "${GITHUB_REF}" == "refs/heads/master" ]; then docker push ${DOCKERHUB_USR}/jupyterlab:latest; fi
222225
223226
- name: Build Base Image - Scala v2.11.12
224227
env:
225228
SCALA_VERSION: "2.11.12"
226229
run: |
230+
echo "${GITHUB_REF}"
227231
cd ${GITHUB_WORKSPACE}/build
228232
docker build \
229233
--build-arg build_date="$(date -u +'%Y-%m-%d')" \
@@ -248,7 +252,7 @@ jobs:
248252
-t jupyterlab:${JUPYTERLAB_VERSION}-spark-${SPARK_VERSION} .
249253
echo ${DOCKERHUB_PWD} | docker login -u ${DOCKERHUB_USR} --password-stdin
250254
docker tag jupyterlab:${JUPYTERLAB_VERSION}-spark-${SPARK_VERSION} ${DOCKERHUB_USR}/jupyterlab:${JUPYTERLAB_VERSION}-spark-${SPARK_VERSION}
251-
if [ "${GITHUB_REF}" == "master" ]; then docker push ${DOCKERHUB_USR}/jupyterlab:${JUPYTERLAB_VERSION}-spark-${SPARK_VERSION}; fi
255+
if [ "${GITHUB_REF}" == "refs/heads/master" ]; then docker push ${DOCKERHUB_USR}/jupyterlab:${JUPYTERLAB_VERSION}-spark-${SPARK_VERSION}; fi
252256
253257
- name: Build & Push JupyterLab Image - JupyterLab v3.0.0 + Spark v2.4.0
254258
env:
@@ -267,4 +271,4 @@ jobs:
267271
-t jupyterlab:${JUPYTERLAB_VERSION}-spark-${SPARK_VERSION} .
268272
echo ${DOCKERHUB_PWD} | docker login -u ${DOCKERHUB_USR} --password-stdin
269273
docker tag jupyterlab:${JUPYTERLAB_VERSION}-spark-${SPARK_VERSION} ${DOCKERHUB_USR}/jupyterlab:${JUPYTERLAB_VERSION}-spark-${SPARK_VERSION}
270-
if [ "${GITHUB_REF}" == "master" ]; then docker push ${DOCKERHUB_USR}/jupyterlab:${JUPYTERLAB_VERSION}-spark-${SPARK_VERSION}; fi
274+
if [ "${GITHUB_REF}" == "refs/heads/master" ]; then docker push ${DOCKERHUB_USR}/jupyterlab:${JUPYTERLAB_VERSION}-spark-${SPARK_VERSION}; fi

0 commit comments

Comments
 (0)