From e50b97c1cc1e6789f2fb0c4f52644171c271976c Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sun, 16 Jan 2022 22:02:12 +0100 Subject: [PATCH] docs: improve comments --- build.sh | 7 +++++++ deploy.sh | 11 +++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 00d354e..fa48f04 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,13 @@ #!/usr/bin/env bash +# remove previous build leftovers rm -rf ./_site + +# build, results are in ./_site lume + +# put fonts in place cp -r ./fonts ./_site/ + +# clean up rm -rf ./_site/README diff --git a/deploy.sh b/deploy.sh index 4273e93..8e8303d 100755 --- a/deploy.sh +++ b/deploy.sh @@ -7,13 +7,16 @@ TAG="$1" if [[ -z "$TAG" ]]; then echo - echo "Error: please provide a docker image tag as second argument, e.g.:" + echo "Error: please provide a docker image tag as first argument, e.g.:" echo "./deploy.sh 1.0.0" echo + echo "You can check the currently deployed tag with" + echo "docker ps -a" + echo exit 1 fi -# Workaround for SSL: CERTIFICATE_VERIFY_FAILED error with docker-compose +# workaround for SSL: CERTIFICATE_VERIFY_FAILED error with docker-compose if [ -z "$CURL_CA_BUNDLE" ]; then if [ ! -f ~/Downloads/cacert-2021-10-26.pem ]; then curl https://curl.se/ca/cacert-2021-10-26.pem -o ~/Downloads/cacert-2021-10-26.pem @@ -21,7 +24,7 @@ if [ -z "$CURL_CA_BUNDLE" ]; then export CURL_CA_BUNDLE=~/Downloads/cacert-2021-10-26.pem fi -# make sure we're using the local docker host first +# make sure we're using the local docker host for building our image eval "$(triton env --unset)" # build the image locally @@ -32,7 +35,7 @@ docker login hub.greenbaum.cloud docker push hub.greenbaum.cloud/miom.space:"$TAG" # change DOCKER_HOST env var to remote docker host (Greenbaum's docker API) -eval "$(triton --profile lev-1-pub.solar env)" +eval "$(triton --account=pub_solar env)" # use our tag for docker-compose export DEPLOY_TAG="$TAG"