Skip to content

Commit

Permalink
Format files
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexRuiz7 committed Jan 19, 2024
1 parent e7895fc commit 12afc25
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 17 deletions.
3 changes: 1 addition & 2 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ before starting Docker Desktop and any of the environments in this folder.

## Development environments

Use the `dev/dev.sh` script to start a development environment.
Use the `dev/dev.sh` script to start a development environment.

Example:

Expand All @@ -74,7 +74,6 @@ Usage: ./ci.sh {up|down|stop} [ci]

Refer to [scripts/README.md](../scripts/README.md) for details about how to build packages.


[docker-desktop]: https://docs.docker.com/get-docker
[docker-variant]: https://docs.docker.com/desktop/install/linux-install/#differences-between-docker-desktop-for-linux-and-docker-engine
[docker-context]: https://docs.docker.com/desktop/install/linux-install/#context
Expand Down
4 changes: 2 additions & 2 deletions docker/ci/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ set -e
# ====
# Checks that the script is run from the intended location
# ====
function check_project_root_folder () {
function check_project_root_folder() {
current=$(basename "$(pwd)")

if [[ "$0" != "./ci.sh" && "$0" != "ci.sh" ]]; then
echo "Run the script from its location"
echo "Run the script from its location"
usage
exit 1
fi
Expand Down
6 changes: 2 additions & 4 deletions docker/ci/ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
version: "3.9"

services:

# Essentially wi-dev, but doesn't expose port 9200
wi-build:
image: wi-build:${VERSION}
Expand All @@ -11,11 +10,10 @@ services:
dockerfile: ${REPO_PATH}/docker/dev/images/Dockerfile
volumes:
- ${REPO_PATH}:/home/wazuh-indexer
entrypoint: ['tail', '-f', '/dev/null']
entrypoint: ["tail", "-f", "/dev/null"]
user: "1000:1000"
working_dir: /home/wazuh-indexer


wi-assemble:
image: wi-assemble:${VERSION}
container_name: wi-assemble_${VERSION}
Expand All @@ -26,6 +24,6 @@ services:
- ${REPO_PATH}/scripts:/home/wazuh-indexer/scripts
- ${REPO_PATH}/artifacts:/home/wazuh-indexer/artifacts
- ${REPO_PATH}/distribution/packages/src:/home/wazuh-indexer/distribution/packages/src
entrypoint: ['tail', '-f', '/dev/null']
entrypoint: ["tail", "-f", "/dev/null"]
user: "1000:1000"
working_dir: /home/wazuh-indexer
3 changes: 0 additions & 3 deletions docker/ci/images/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,3 @@ RUN mkdir /home/wazuh-indexer && \
chown -R 1000:1000 /home/wazuh-indexer
USER wazuh-indexer
WORKDIR /home/wazuh-indexer



4 changes: 2 additions & 2 deletions docker/dev/dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ set -e
# ====
# Checks that the script is run from the intended location
# ====
function check_project_root_folder () {
function check_project_root_folder() {
current=$(basename "$(pwd)")

if [[ "$0" != "./dev.sh" && "$0" != "dev.sh" ]]; then
echo "Run the script from its location"
echo "Run the script from its location"
usage
exit 1
fi
Expand Down
5 changes: 2 additions & 3 deletions docker/dev/dev.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
version: "3.9"

services:

wi-dev:
image: wi-dev:${VERSION}
container_name: wi-dev_${VERSION}
Expand All @@ -15,6 +14,6 @@ services:
- 9200
volumes:
- ${REPO_PATH}:/home/wazuh-indexer
entrypoint: ['tail', '-f', '/dev/null']
entrypoint: ["tail", "-f", "/dev/null"]
user: "1000:1000"
working_dir: /home/wazuh-indexer
working_dir: /home/wazuh-indexer
2 changes: 1 addition & 1 deletion scripts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ The generated package is sent to `artifacts/`

## Assemble

**Note:** set the environment variable `TEST=true` to assemble a package with the required plugins only,
**Note:** set the environment variable `TEST=true` to assemble a package with the required plugins only,
speeding up the assembly process.

<!--
Expand Down

0 comments on commit 12afc25

Please sign in to comment.