Skip to content

Commit 3f150f2

Browse files
Merge pull request #467 from codacy/revert-adding-new-flag
Revert changes TS-180
2 parents c80e17a + 488fcd0 commit 3f150f2

2 files changed

Lines changed: 4 additions & 14 deletions

File tree

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ Found [Clone] 7 duplicated lines with 10 tokens:
206206
* `--skip-uncommitted-files-check` [default: false] - Skip check for uncommitted files in the analysis directory
207207
* `--upload` [default: false] - Request to push results to Codacy
208208
* `--upload-batch-size` [default: 50000] - Maximum number of results in each batch to upload to Codacy
209-
* `--skip-docker-test` [default: false] - Skip testing if the default Unix socket for the Docker daemon exists
210209
* `--skip-ssl-verification` [default: false] - Skip the SSL certificate verification when communicating with the Codacy API
211210
* `--parallel` [default: 2] - Number of tools to run in parallel
212211
* `--max-allowed-issues` [default: 0] - Maximum number of issues allowed for the analysis to succeed

bin/codacy-analysis-cli.sh

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ log_error() {
1818
}
1919

2020
test_docker_socket() {
21-
if [ "${SKIP_DOCKER_TEST}" == false ]; then
22-
if [ ! -S /var/run/docker.sock ]; then
23-
log_error "/var/run/docker.sock must exist as a Unix domain socket"
24-
elif [ -n "${DOCKER_HOST}" ] && [ "${DOCKER_HOST}" != "unix:///var/run/docker.sock" ]; then
25-
log_error "invalid DOCKER_HOST=${DOCKER_HOST}, must be unset or unix:///var/run/docker.sock"
26-
fi
21+
if [ ! -S /var/run/docker.sock ]; then
22+
log_error "/var/run/docker.sock must exist as a Unix domain socket"
23+
elif [ -n "${DOCKER_HOST}" ] && [ "${DOCKER_HOST}" != "unix:///var/run/docker.sock" ]; then
24+
log_error "invalid DOCKER_HOST=${DOCKER_HOST}, must be unset or unix:///var/run/docker.sock"
2725
fi
2826
}
2927

@@ -119,13 +117,6 @@ prep_args_with_output_absolute_path() {
119117
ARGUMENTS_WITH_ABSOLUTE_PATH_OUTPUT="$new_args"
120118
}
121119

122-
SKIP_DOCKER_TEST=false
123-
while [[ "$#" -gt 0 ]]; do
124-
case $1 in
125-
--skip-docker-test) SKIP_DOCKER_TEST=true ;;
126-
esac
127-
shift
128-
done
129120

130121
test_docker_socket
131122

0 commit comments

Comments
 (0)