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

Docker compose fix #331

Merged
merged 2 commits into from
Sep 6, 2024
Merged

Docker compose fix #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78a8bf7
migrate docker-compose calls in ci and cd to docker compose calls and…
Wolkenfarmer Sep 5, 2024
2180a68
adjust documentation to new docker compose
Wolkenfarmer Sep 5, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/ci-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Build frontend Docker container
run: |
cd ./frontend/
docker-compose --env-file .env.dev up -d
docker compose --env-file .env.dev up --build -d

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
Expand All @@ -43,7 +43,7 @@ jobs:
- name: Build backend Docker containers
run: |
cd ./backend/dps_training_k/
docker-compose --env-file .env.dev up -d
docker compose --env-file .env.dev up --build -d

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:

- name: Run docker containers with deploy dev configuration
run: |
docker-compose -f docker-compose.dev.yml up -d
docker compose -f docker-compose.dev.yml up -d

- name: Run integration tests
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ jobs:
- name: Build and push frontend Docker images
run: |
cd ./frontend/
docker-compose --env-file .env.prod build
docker compose --env-file .env.prod build
docker tag dps_training_k-frontend ghcr.io/hpi-sam/dps_training_k-frontend:latest
docker push ghcr.io/hpi-sam/dps_training_k-frontend:latest

- name: Build and push backend Docker images
run: |
cd ./backend/dps_training_k/
docker-compose --env-file .env.prod build
docker compose --env-file .env.prod build
docker tag dps_training_k-django ghcr.io/hpi-sam/dps_training_k-django:latest
docker push ghcr.io/hpi-sam/dps_training_k-django:latest
docker tag dps_training_k-celeryworker ghcr.io/hpi-sam/dps_training_k-celeryworker:latest
Expand Down
2 changes: 1 addition & 1 deletion backend/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ meaning it will expect the frontend to run on localhost.

Build and run:
```bash
docker compose --env-file .env.<prod/dev> up
docker compose --env-file .env.<prod/dev> up --build
```

Optionally, to access the database, create a superuser account:
Expand Down
2 changes: 1 addition & 1 deletion docs/deployment-process.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ docker login ghcr.io -u <username> -p <token>
```
8. Run following commands to run the containers:
```bash
docker-compose -f docker-compose.<dev/prod>.yml up
docker compose -f docker-compose.<dev/prod>.yml up --build
```

The application is now deployed and the website should be accessible via http (`dev`) or https (`prod`). The images will be automatically updated on each
Expand Down
2 changes: 1 addition & 1 deletion frontend/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ npm run <prod/dev>
Note that neither version supports hot-reloading.

```bash
docker-compose --env-file .env.<prod/dev> up --build
docker compose --env-file .env.<prod/dev> up --build
```

## Project structure
Expand Down
Loading