From 391690e908fe1387e7fab4002877ae015e76e4e6 Mon Sep 17 00:00:00 2001 From: admin2 Date: Sun, 27 Nov 2022 06:40:02 +0300 Subject: [PATCH] start with ssh-key docker secret --- .dockerignore | 1 + git2zola.sh | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index 7275ffe..7d06882 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,4 @@ build.sh README.md .gitignore +run diff --git a/git2zola.sh b/git2zola.sh index e471c9c..e13177c 100755 --- a/git2zola.sh +++ b/git2zola.sh @@ -134,7 +134,7 @@ getTheme () { if [ -d ./${GITTHEMENAME} ] then cd ./${GITTHEMENAME} - gitpull=$(git pull --dry-run --ff-only) + gitpull=$(git pull --dry-run --ff-only 2>&1) if [ ! -z ${gitpull} ] then echo "getting new design" @@ -171,7 +171,8 @@ do if [ ${gitstatus} -eq 0 ] then echo "testing for new data" - gitpull=$(git pull --dry-run --ff-only) + # all outputs from git goes to error output + gitpull=$(git pull --dry-run --ff-only 2>&1) if [ ! -z ${gitpull} ] then getTheme