From 517f972f74a6b175445755431fc6c1e602ca21a8 Mon Sep 17 00:00:00 2001 From: re3turn Date: Sun, 3 Apr 2022 02:38:42 +0900 Subject: [PATCH] Fix jq command error --- docker-entrypoint | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-entrypoint b/docker-entrypoint index 2696ee5..b49a8b6 100755 --- a/docker-entrypoint +++ b/docker-entrypoint @@ -60,13 +60,13 @@ slugify() { make_image_cmd() { DOCKERARGS=$(echo ${1} | jq -r .dockerargs) - VOLUMES=$(echo ${1} | jq -r '.volumes | map(" -v " + .) | join("")') - PORTS=$(echo ${1} | jq -r '.ports | map(" -p " + .) | join("")') - EXPOSE=$(echo ${1} | jq -r '.expose | map(" --expose " + .) | join("")') + VOLUMES=$(echo ${1} | jq -r 'select(.volumes != null) | .volumes | map(" -v " + .) | join("")') + PORTS=$(echo ${1} | jq -r 'select(.ports != null) | .ports | map(" -p " + .) | join("")') + EXPOSE=$(echo ${1} | jq -r 'select(.expose != null) | .expose | map(" --expose " + .) | join("")') # We'll add name in, if it exists NAME=$(echo ${1} | jq -r 'select(.name != null) | .name') NETWORK=$(echo ${1} | jq -r 'select(.network != null) | .network') - ENVIRONMENT=$(echo ${1} | jq -r '.environment | map(" -e " + .) | join("")') + ENVIRONMENT=$(echo ${1} | jq -r 'select(.environment != null) | .environment | map(" -e " + .) | join("")') # echo ${1} | jq -r '.environment | join("\n")' > ${PWD}/${NAME}.env # ENVIRONMENT=" --env-file ${PWD}/${NAME}.env" if [ "${DOCKERARGS}" == "null" ]; then DOCKERARGS=; fi