From a8724715a9b346fa81402501c4b30436439c1e76 Mon Sep 17 00:00:00 2001 From: massongit Date: Sun, 4 Feb 2024 18:34:57 +0900 Subject: [PATCH] Fix format --- scripts/release/dockle/run_dockle.sh | 48 +++++++++---------- scripts/super_linter/super_linter/set_path.sh | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/scripts/release/dockle/run_dockle.sh b/scripts/release/dockle/run_dockle.sh index af7af2f7e..f72c2ff05 100755 --- a/scripts/release/dockle/run_dockle.sh +++ b/scripts/release/dockle/run_dockle.sh @@ -8,33 +8,33 @@ docker compose -f compose.yml -f "${DOCKER_COMPOSE_FILE_NAME}" pull "${SERVICE_N docker compose -f compose.yml -f "${DOCKER_COMPOSE_FILE_NAME}" up -d "${SERVICE_NAME}" for image_name in $(docker compose -f compose.yml -f "${DOCKER_COMPOSE_FILE_NAME}" images "${SERVICE_NAME}" | awk 'OFS=":" {print $2,$3}' | tail -n +2); do - cmd="dockle --exit-code 1 " + cmd="dockle --exit-code 1 " - if [[ "${image_name}" =~ "gcloud_datastore" ]] || [[ "${image_name}" =~ "server-dev" ]] || [[ "${image_name}" =~ "server-base" ]]; then - cmd+="-i DKL-LI-0003 " + if [[ "${image_name}" =~ "gcloud_datastore" ]] || [[ "${image_name}" =~ "server-dev" ]] || [[ "${image_name}" =~ "server-base" ]]; then + cmd+="-i DKL-LI-0003 " - if [[ "${image_name}" =~ "gcloud_datastore" ]] || [[ "${image_name}" =~ "server-base" ]]; then - cmd+="-i CIS-DI-0001 " - if [[ "${image_name}" =~ "gcloud_datastore" ]]; then - cmd+="-af settings.py " - fi - fi + if [[ "${image_name}" =~ "gcloud_datastore" ]] || [[ "${image_name}" =~ "server-base" ]]; then + cmd+="-i CIS-DI-0001 " + if [[ "${image_name}" =~ "gcloud_datastore" ]]; then + cmd+="-af settings.py " + fi + fi - if [[ "${image_name}" =~ "server-dev" ]] || [[ "${image_name}" =~ "server-base" ]]; then - cmd+="--timeout 600s " - if [[ "${image_name}" =~ "server-dev" ]]; then - cmd+="-af credentials " - fi - fi - elif [[ "${image_name}" =~ "frontend:" ]]; then - cmd+="-ak NGINX_GPGKEY " - fi + if [[ "${image_name}" =~ "server-dev" ]] || [[ "${image_name}" =~ "server-base" ]]; then + cmd+="--timeout 600s " + if [[ "${image_name}" =~ "server-dev" ]]; then + cmd+="-af credentials " + fi + fi + elif [[ "${image_name}" =~ "frontend:" ]]; then + cmd+="-ak NGINX_GPGKEY " + fi - if [[ "${image_name}" =~ "frontend-base" ]] || [[ "${image_name}" =~ "server-base" ]]; then - cmd+="-i CIS-DI-0006 " - fi + if [[ "${image_name}" =~ "frontend-base" ]] || [[ "${image_name}" =~ "server-base" ]]; then + cmd+="-i CIS-DI-0006 " + fi - cmd+="${image_name}" - echo "> ${cmd}" - eval "${cmd}" + cmd+="${image_name}" + echo "> ${cmd}" + eval "${cmd}" done diff --git a/scripts/super_linter/super_linter/set_path.sh b/scripts/super_linter/super_linter/set_path.sh index a53764245..2ad4fed37 100644 --- a/scripts/super_linter/super_linter/set_path.sh +++ b/scripts/super_linter/super_linter/set_path.sh @@ -3,4 +3,4 @@ npm ci action="$(yq '.jobs.super-linter.steps[-1].uses' .github/workflows/super-linter.yml)" PATH="$(docker run --rm --entrypoint '' "ghcr.io/${action//\/slim@/:slim-}" /bin/sh -c 'echo $PATH')" -echo "PATH=/github/workspace/node_modules/.bin:${PATH}" >> "$GITHUB_ENV" +echo "PATH=/github/workspace/node_modules/.bin:${PATH}" >>"$GITHUB_ENV"