From df389b9ce51887d6ba3d8126c889949cf4fd673e Mon Sep 17 00:00:00 2001 From: James Polley Date: Wed, 4 Oct 2017 23:56:28 +1100 Subject: [PATCH] Revert "Split out dev/prod docker builds into parallel jobs." This reverts commit d7065ee43d31f55b1ad9860d3cb5e1cbdb747e73. Dev build re-uses prod build, so they can't be split (and dev build won't take much extra time anyway) --- .gitlab-ci.yml | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f4af45e..ec9f0818 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,26 +1,17 @@ -build_test_image: - image: docker:git - services: - - docker:dind - script: - - docker build --build-arg CI_COMMIT_SHA=$CI_COMMIT_SHA -f docker/Dockerfile.dev -t asia.gcr.io/linuxconfsydney/symposion_app_dev:$CI_COMMIT_SHA . - - docker login -u _json_key -p "$GOOGLE_KEY" https://asia.gcr.io - - docker push asia.gcr.io/linuxconfsydney/symposion_app_dev:$CI_COMMIT_SHA - - docker tag asia.gcr.io/linuxconfsydney/symposion_app_dev:$CI_COMMIT_SHA asia.gcr.io/linuxconfsydney/symposion_app_dev:latest - - docker push asia.gcr.io/linuxconfsydney/symposion_app_dev:latest - only: - - master - -build_prod_image: +build_image: image: docker:git services: - docker:dind script: - docker build -f docker/Dockerfile -t asia.gcr.io/linuxconfsydney/symposion_app:$CI_COMMIT_SHA . + - docker build --build-arg CI_COMMIT_SHA=$CI_COMMIT_SHA -f docker/Dockerfile.dev -t asia.gcr.io/linuxconfsydney/symposion_app_dev:$CI_COMMIT_SHA . - docker login -u _json_key -p "$GOOGLE_KEY" https://asia.gcr.io - docker push asia.gcr.io/linuxconfsydney/symposion_app:$CI_COMMIT_SHA + - docker push asia.gcr.io/linuxconfsydney/symposion_app_dev:$CI_COMMIT_SHA - docker tag asia.gcr.io/linuxconfsydney/symposion_app:$CI_COMMIT_SHA asia.gcr.io/linuxconfsydney/symposion_app:latest + - docker tag asia.gcr.io/linuxconfsydney/symposion_app_dev:$CI_COMMIT_SHA asia.gcr.io/linuxconfsydney/symposion_app_dev:latest - docker push asia.gcr.io/linuxconfsydney/symposion_app:latest + - docker push asia.gcr.io/linuxconfsydney/symposion_app_dev:latest only: - master