Skip to content
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

Jump to bottom

Switch from docker-compose to docker compose. #1393

Merged
merged 1 commit into from
Aug 15, 2024
Merged

Switch from docker-compose to docker compose. #1393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ jobs:
- run: npm ci
- run: cp config.example.yml config.yml
- run: npm run build
- run: docker-compose -f docker-compose.test.yml up -d db api api-go frontend
- run: docker compose -f docker-compose.test.yml up -d db api api-go frontend
- run: sleep 60
- run: yarn cypress run
- if: always()
run: docker-compose -f docker-compose.test.yml logs -t # Output all docker logs from API and frontend to help debugging after the fact
run: docker compose -f docker-compose.test.yml logs -t # Output all docker logs from API and frontend to help debugging after the fact
- uses: actions/upload-artifact@v2
if: failure()
with:
Expand Down
14 changes: 7 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ $ cp config.example.yml config.yml

```sh
# Install node dependencies
$ docker-compose run --rm web npm install
$ docker compose run --rm web npm install

# Build static assets bundle
$ docker-compose run --rm web npm run build
$ docker compose run --rm web npm run build

# Run dev server
$ docker-compose up
$ docker compose up
```

You should be able to view the web app in your browser at http://localhost:8080.
Expand All @@ -80,7 +80,7 @@ The following command will stop all running Docker containers, delete them, and
remove their volumes:

```sh
$ docker-compose down --remove-orphans --volumes
$ docker compose down --remove-orphans --volumes
```

Note: When you run that command, you may get an error message about removing
Expand All @@ -92,8 +92,8 @@ ERROR: error while removing network: network askdarcel id
endpoints
```

If this happens, then you need to run `docker-compose stop` in the askdarcel-api
application first before running the `docker-compose down` command above.
If this happens, then you need to run `docker compose stop` in the askdarcel-api
application first before running the `docker compose down` command above.

## Non-Docker Development Environment

Expand Down Expand Up @@ -151,7 +151,7 @@ Note: Make sure you have the dev server running (`npm run dev`) before you try r
If you are using Docker, then you'll need to run it somewhat like this:

```
$ docker-compose run --rm -p 1337:1337 -e BASE_URL=http://web:8080 web npm run testcafe -- --skip-js-errors remote --skip-js-errors --hostname localhost --ports 1337,1338 ./testcafe/
$ docker compose run --rm -p 1337:1337 -e BASE_URL=http://web:8080 web npm run testcafe -- --skip-js-errors remote --skip-js-errors --hostname localhost --ports 1337,1338 ./testcafe/
```

This will spin up a web server at http://localhost:1337/ and print out a URL to use. You should manually enter it into your browser to start the tests.
Loading