From f6b629bd60aaed2eec6012354db8b322eb402fd6 Mon Sep 17 00:00:00 2001 From: James Polley Date: Wed, 4 Oct 2017 23:47:47 +1100 Subject: [PATCH 1/2] Remove debugging line left on profile form. --- pinaxcon/templates/registrasion/profile_form.html | 1 - 1 file changed, 1 deletion(-) diff --git a/pinaxcon/templates/registrasion/profile_form.html b/pinaxcon/templates/registrasion/profile_form.html index af6c393d..3a101234 100644 --- a/pinaxcon/templates/registrasion/profile_form.html +++ b/pinaxcon/templates/registrasion/profile_form.html @@ -26,7 +26,6 @@ {% endblock %} {% block content %} -THIS IS THE FORM
{% csrf_token %} From d7065ee43d31f55b1ad9860d3cb5e1cbdb747e73 Mon Sep 17 00:00:00 2001 From: James Polley Date: Wed, 4 Oct 2017 23:40:47 +1100 Subject: [PATCH 2/2] Split out dev/prod docker builds into parallel jobs. --- .gitlab-ci.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec9f0818..6f4af45e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,17 +1,26 @@ -build_image: +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: 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