From 09f38bbd16e56260141b2e0e348580887265bfd3 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 29 Sep 2021 14:53:52 -0700 Subject: [PATCH] Fix errors in deploy script Also, allow deploying to staging with uncommitted changes. Co-Authored-By: Nathan Sobo --- script/deploy | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/script/deploy b/script/deploy index 78f965575c..b375329c91 100755 --- a/script/deploy +++ b/script/deploy @@ -22,16 +22,16 @@ if [[ ! -f $ENV_FILE ]]; then exit 1 fi -if [[ -n $(git status --short) ]]; then - echo "Cannot deploy with uncommited changes" +if [[ $ZED_KUBE_NAMESPACE == "production" && -n $(git status --short) ]]; then + echo "Cannot deploy uncommited changes to production" exit 1 fi git_sha=$(git rev-parse HEAD) -export ZED_IMAGE_ID=registry.digitalocean.com/zed/zed-server:${ZED_KUBE_NAMESPACE}-${git_sha} +export ZED_IMAGE_ID="registry.digitalocean.com/zed/zed-server:${ZED_KUBE_NAMESPACE}-${git_sha}" export $(cat $ENV_FILE) -docker build . --tag $ZED_IMAGE_ID -docker push $ZED_IMAGE_ID +docker build . --tag "$ZED_IMAGE_ID" +docker push "$ZED_IMAGE_ID" envsubst < server/k8s/manifest.template.yml | kubectl apply -f -