Skip to content

Commit

Permalink
Fix format
Browse files Browse the repository at this point in the history
  • Loading branch information
massongit committed Feb 4, 2024
1 parent 40ce80c commit a872471
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
48 changes: 24 additions & 24 deletions scripts/release/dockle/run_dockle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion scripts/super_linter/super_linter/set_path.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit a872471

Please sign in to comment.