Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Charles Neill <[email protected]>
  • Loading branch information
kiblik and cneill authored Sep 17, 2024
1 parent a5bfd5a commit c34c02a
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 21 deletions.
8 changes: 4 additions & 4 deletions dc-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ if [ $# -eq 0 ]
then
echo "Building docker compose"
# Compose V2 integrates compose functions into the Docker platform,
# continuing to support most of the previous docker compose features
# continuing to support most of the previous docker-compose features
# and flags. You can run Compose V2 by replacing the hyphen (-) with
# a space, using docker compose, instead of docker compose.
# a space, using docker compose, instead of docker-compose.
docker compose build
else
echo "Building docker compose with additional parameter $1 ..."
# Compose V2 integrates compose functions into the Docker platform,
# continuing to support most of the previous docker compose features
# continuing to support most of the previous docker-compose features
# and flags. You can run Compose V2 by replacing the hyphen (-) with
# a space, using docker compose, instead of docker compose.
# a space, using docker compose, instead of docker-compose.
docker compose build "$1"
fi
8 changes: 4 additions & 4 deletions dc-down.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ if [ $# -eq 0 ]
then
echo "Stopping docker compose and removing containers"
# Compose V2 integrates compose functions into the Docker platform,
# continuing to support most of the previous docker compose features
# continuing to support most of the previous docker-compose features
# and flags. You can run Compose V2 by replacing the hyphen (-) with
# a space, using docker compose, instead of docker compose.
# a space, using docker compose, instead of docker-compose.
docker compose down
else
echo "Stopping docker compose and removing containers with additional parameter $1 ..."
# Compose V2 integrates compose functions into the Docker platform,
# continuing to support most of the previous docker compose features
# continuing to support most of the previous docker-compose features
# and flags. You can run Compose V2 by replacing the hyphen (-) with
# a space, using docker compose, instead of docker compose.
# a space, using docker compose, instead of docker-compose.
docker compose down "$1"
fi
4 changes: 2 additions & 2 deletions dc-integration-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ done
echo "Running docker compose unit tests with profile postgres-redis and test case $TEST_CASE ..."

# Compose V2 integrates compose functions into the Docker platform,
# continuing to support most of the previous docker compose features
# continuing to support most of the previous docker-compose features
# and flags. You can run Compose V2 by replacing the hyphen (-) with
# a space, using docker compose, instead of docker compose.
# a space, using docker compose, instead of docker-compose.
echo "Building images..."
./docker/setEnv.sh integration_tests
./dc-build.sh
Expand Down
8 changes: 4 additions & 4 deletions dc-stop.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ if [ $# -eq 0 ]
then
echo "Stopping docker compose"
# Compose V2 integrates compose functions into the Docker platform,
# continuing to support most of the previous docker compose features
# continuing to support most of the previous docker-compose features
# and flags. You can run Compose V2 by replacing the hyphen (-) with
# a space, using docker compose, instead of docker compose.
# a space, using docker compose, instead of docker-compose.
docker compose stop
else
echo "Stopping docker compose with additional parameter $1 ..."
# Compose V2 integrates compose functions into the Docker platform,
# continuing to support most of the previous docker compose features
# continuing to support most of the previous docker-compose features
# and flags. You can run Compose V2 by replacing the hyphen (-) with
# a space, using docker compose, instead of docker compose.
# a space, using docker compose, instead of docker-compose.
docker compose stop "$1"
fi
4 changes: 2 additions & 2 deletions dc-unittest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,6 @@ fi

echo "Running docker compose unit tests with test case $TEST_CASE ..."
# Compose V2 integrates compose functions into the Docker platform, continuing to support
# most of the previous docker compose features and flags. You can run Compose V2 by
# replacing the hyphen (-) with a space, using docker compose, instead of docker compose.
# most of the previous docker-compose features and flags. You can run Compose V2 by
# replacing the hyphen (-) with a space, using docker compose, instead of docker-compose.
docker compose exec uwsgi bash -c "python manage.py test $TEST_CASE -v2 --keepdb"
4 changes: 2 additions & 2 deletions dc-up-d.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ if [[ $? -eq 1 ]]; then exit 1; fi
echo "Starting docker compose in the background ..."

# Compose V2 integrates compose functions into the Docker platform, continuing to support
# most of the previous docker compose features and flags. You can run Compose V2 by
# replacing the hyphen (-) with a space, using docker compose, instead of docker compose.
# most of the previous docker-compose features and flags. You can run Compose V2 by
# replacing the hyphen (-) with a space, using docker compose, instead of docker-compose.
docker compose up --no-deps -d
4 changes: 2 additions & 2 deletions dc-up.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ bash ./docker/docker-compose-check.sh
if [[ $? -eq 1 ]]; then exit 1; fi

# Compose V2 integrates compose functions into the Docker platform, continuing to support
# most of the previous docker compose features and flags. You can run Compose V2 by
# replacing the hyphen (-) with a space, using docker compose, instead of docker compose.
# most of the previous docker-compose features and flags. You can run Compose V2 by
# replacing the hyphen (-) with a space, using docker compose, instead of docker-compose.
docker compose up --no-deps
echo "Starting docker compose in the foreground ..."
2 changes: 1 addition & 1 deletion docs/content/en/getting_started/upgrading/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ The generic upgrade method for docker compose are as follows:
docker pull defectdojo/defectdojo-nginx:1.10.2-alpine
```
- Go to the directory where your docker compose.yml file lives
- Go to the directory where your docker-compose.yml file lives
- Stop DefectDojo: `./dc-stop.sh`
- Re-start DefectDojo, allowing for container recreation:
`./dc-up-d.sh`
Expand Down

0 comments on commit c34c02a

Please sign in to comment.