From 99788e8d4743f2998bab821b31bcaa293ce7ba3f Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Sun, 5 Nov 2017 10:06:39 +0200 Subject: [PATCH 1/7] Use correct registry URL in docker-compose --- .gitlab-ci.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d16cf6..5866bca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,7 +76,7 @@ deploy_dev: - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' script: - scp docker-compose.yml $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment/docker-compose.yml - - ssh $DEV_SSH_USER@$DEV_SSH_HOST "cd deployment && docker-compose down && docker pull \"$IMAGE_NAME\" && docker-compose up -d && docker image prune -f" + - ssh $DEV_SSH_USER@$DEV_SSH_HOST "cd deployment && docker-compose down && docker pull \"$IMAGE_NAME\" && docker-compose up -d && docker container prune -f && docker image prune -f && docker volume prune -f" deploy_production: stage: deploy diff --git a/docker-compose.yml b/docker-compose.yml index 507ec1e..3ebafe5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: image: postgres web: build: . - image: 86.50.143.82:5000/web20 + image: git.sahkoinsinoorikilta.fi:4567/vtmk/web2.0 command: ["bash", "-c", "cd /code && ./wait-for-it.sh db:5432 -- bash setup.sh --no-input --no-npm && python manage.py runserver 0.0.0.0:8080"] ports: - "8080:8080" From efb1ee618286d0d183568aefc330ae43731770ce Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Sun, 5 Nov 2017 10:38:39 +0200 Subject: [PATCH 2/7] Improve dev deployment --- .deploy_dev.sh | 19 +++++++++++++++++++ .gitlab-ci.yml | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 .deploy_dev.sh diff --git a/.deploy_dev.sh b/.deploy_dev.sh new file mode 100644 index 0000000..9a82f6d --- /dev/null +++ b/.deploy_dev.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +echo "Deploying to development." +set -e +set -x + +pushd deployment + +docker-compose down +docker pull "$1" +docker-compose up -d +docker container prune -f +docker image prune -f +docker volume prune -f + +popd + +set +x +set +e \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5866bca..d5f033c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,7 +76,8 @@ deploy_dev: - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' script: - scp docker-compose.yml $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment/docker-compose.yml - - ssh $DEV_SSH_USER@$DEV_SSH_HOST "cd deployment && docker-compose down && docker pull \"$IMAGE_NAME\" && docker-compose up -d && docker container prune -f && docker image prune -f && docker volume prune -f" + - scp .deploy_dev.sh $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment/deploy_dev.sh + - ssh $DEV_SSH_USER@$DEV_SSH_HOST "bash ~/deployment/deploy_dev.sh" deploy_production: stage: deploy From 08e675f69810326b8af64127a076d2c90068e829 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Sun, 5 Nov 2017 10:47:30 +0200 Subject: [PATCH 3/7] Add missing script parameter --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5f033c..0da6a53 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -77,7 +77,7 @@ deploy_dev: script: - scp docker-compose.yml $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment/docker-compose.yml - scp .deploy_dev.sh $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment/deploy_dev.sh - - ssh $DEV_SSH_USER@$DEV_SSH_HOST "bash ~/deployment/deploy_dev.sh" + - ssh $DEV_SSH_USER@$DEV_SSH_HOST "bash ~/deployment/deploy_dev.sh \"$IMAGE_NAME\"" deploy_production: stage: deploy From 417083b050e88684be6c7104836bee7819b8e5ed Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Sun, 5 Nov 2017 11:48:09 +0200 Subject: [PATCH 4/7] Do not prune docker volumes on dev deploy --- .deploy_dev.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.deploy_dev.sh b/.deploy_dev.sh index 9a82f6d..04374ca 100644 --- a/.deploy_dev.sh +++ b/.deploy_dev.sh @@ -11,7 +11,6 @@ docker pull "$1" docker-compose up -d docker container prune -f docker image prune -f -docker volume prune -f popd From aaf773c60033a2990c8a0a03a87809b193156f2e Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Sun, 5 Nov 2017 17:21:29 +0200 Subject: [PATCH 5/7] Gitlab runner is being funky so I'm grasping at straws --- .deploy_dev.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.deploy_dev.sh b/.deploy_dev.sh index 04374ca..eb04f90 100644 --- a/.deploy_dev.sh +++ b/.deploy_dev.sh @@ -9,8 +9,6 @@ pushd deployment docker-compose down docker pull "$1" docker-compose up -d -docker container prune -f -docker image prune -f popd From 6678c691dd86f31c7bcb8181891e8b62fb0932c1 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Wed, 8 Nov 2017 17:55:56 +0200 Subject: [PATCH 6/7] Add error to coffee display when there is a connection problem Resolves #87 --- coffee_scale/static/js/coffee.js | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/coffee_scale/static/js/coffee.js b/coffee_scale/static/js/coffee.js index f885408..20744cc 100644 --- a/coffee_scale/static/js/coffee.js +++ b/coffee_scale/static/js/coffee.js @@ -36,12 +36,29 @@ function onConnect() { // data update and parse functions function parseCups(ev){ var cups = parseFloat(ev.detail).toFixed(1) - var cupsEvent = new CustomEvent("cupsChanged", {'detail': cups}); - window.dispatchEvent(cupsEvent); + if (String(cups) !== '-1.0') { + var cupsEvent = new CustomEvent("cupsChanged", {'detail': cups}); + window.dispatchEvent(cupsEvent); + } else { + var cupsEvent = new CustomEvent("cupsError", {'detail': 'Error: unable to fetch cups :('}); + window.dispatchEvent(cupsEvent); + } } function updateCups(ev){ $("#text").text(ev.detail); } +function showCupsError(ev) { + $('#text').text(ev.detail); + $('#text').css({ + 'font-size': '7vh', + 'left': '0', + 'top': '40%', + 'width': '100%', + 'text-align': 'center', + 'color': 'red', + }); + $('#lower').css({'background-image': 'none'}); +} function updateScale(ev){ $("#scale2").css({width: Math.min(ev.detail/9*100,100) + '%'}); } @@ -72,7 +89,6 @@ function brewAnimStart(){ $(".text").addClass("brewing"); $(".layerone").hide(); $(".layertwo").show(); - } function brewAnimEnd(){ $(".text").removeClass("brewing"); @@ -145,6 +161,11 @@ $(document).ready(function(){ window.addEventListener("cupsChanged", coffeeLowEffect); window.addEventListener("cupsChanged", updateScale); window.addEventListener("cupsChanged", resize); + + window.addEventListener("cupsError", showCupsError); + window.addEventListener("cupsError", coffeeLowEffect); + window.addEventListener("cupsError", updateScale); + window.addEventListener("brewStart", brewAnimStart); window.addEventListener("brewEnd", brewAnimEnd); window.addEventListener("brewEnd", coffeeReadyEffect); From ab2682a0d3dda98efd578215c3f7a2215bcb87e8 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Wed, 8 Nov 2017 18:09:45 +0200 Subject: [PATCH 7/7] Fix eslint offenses --- coffee_scale/static/js/coffee.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/coffee_scale/static/js/coffee.js b/coffee_scale/static/js/coffee.js index 20744cc..025387d 100644 --- a/coffee_scale/static/js/coffee.js +++ b/coffee_scale/static/js/coffee.js @@ -36,13 +36,14 @@ function onConnect() { // data update and parse functions function parseCups(ev){ var cups = parseFloat(ev.detail).toFixed(1) - if (String(cups) !== '-1.0') { - var cupsEvent = new CustomEvent("cupsChanged", {'detail': cups}); - window.dispatchEvent(cupsEvent); - } else { - var cupsEvent = new CustomEvent("cupsError", {'detail': 'Error: unable to fetch cups :('}); - window.dispatchEvent(cupsEvent); + + function makeEvent(cups) { + return (String(cups) !== '-1.0') + ? new CustomEvent("cupsChanged", {'detail': cups}) + : new CustomEvent("cupsError", {'detail': 'Error: unable to fetch cups :('}); } + + window.dispatchEvent(makeEvent(cups)); } function updateCups(ev){ $("#text").text(ev.detail);