Skip to content

minor chores #967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
proditis merged 3 commits into from
Aug 17, 2023
Merged

minor chores #967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06094d5
mention docker pull instead of docker-compose
proditis Aug 17, 2023
59efe72
make backend error messages visible
proditis Aug 17, 2023
9aeb369
mention the correct volumes
proditis Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions backend/web/css/site.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,19 @@ a.desc:after {
border-radius: 50%;
align-items: center;
justify-content: center;
}

div.has-error {
border: 1px dashed red;
padding: 4px;
}
div.has-error > input {
background-color: lightpink;
}
div.has-error > input:focus {
background-color: lightpink;
}
.help-block {
color: red;
font-weight: 600;
}
13 changes: 11 additions & 2 deletions docs/DOCKER-COMPOSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,27 @@ The following volumes are configured and used
* `echoctfred_data-mysql` For persistent mysql data
* `echoctfred_data-openvpn` For persistent openvpn data
* `echoctfred_data-challenges` under backend & frontend `/var/www/echoCTF.RED/*/web/uploads`
* `./themes/images` under `/var/www/echoCTF.RED/*/web/images` for logos and images
* `frontend/web/images` under `/var/www/echoCTF.RED/frontend/web/images` for frontend logos and images
* `backend/web/images` under `/var/www/echoCTF.RED/backend/web/images` for backend logos and images

You can modify the volumes and port mappings by editing the corresponding values in the `docker-compose.yml` file.

The following diagram illustrates the docker networks and containers that are configured by `docker-compose`.
![echoCTF.RED docker-compose topology](assets/docker-compose-topology.png?)

## Starting up
The easy way to start is to use the official docker images and starting them up by executing.
```sh
docker-compose pull
docker pull echothrust/echoctf.red-db:latest
docker pull echothrust/echoctf.red-backend:latest
docker pull echothrust/echoctf.red-frontend:latest
docker pull echothrust/echoctf.red-vpn:latest
chmod a+rw frontend/web/images/{avatars,avatars/badges,targets}
docker-compose up
```

NOTE: You need to pull the images manually with `docker pull`.

The first time you run `docker-compose up` give the containers a few minutes to complete the startup process.

If you'd rather to build your own images make you sure you generate a Github OAuth Token to
Expand Down