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

1.0.7 #395

Merged
merged 2 commits into from
Jan 18, 2025
Merged

1.0.7 #395

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
aa97f78
updating dependencies
mako321 Jan 17, 2025
9e664c4
updating dependencies
Jan 18, 2025
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
48 changes: 24 additions & 24 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ restart_queue_cron:
- docker compose restart escola_lms_queue_cron

update-composer-to-git:
- git checkout develop
- git pull
- git checkout develop
- git pull
- docker compose up -d api
- docker compose exec api bash -c "XDEBUG_MODE=off composer update --no-scripts"
- git add composer.lock
- git commit -m "updating dependecies"
- git push origin develop
- git add composer.lock
- git commit -m "updating dependencies"
- git push origin develop


swagger-generate:
Expand Down Expand Up @@ -78,16 +78,16 @@ backup-postgres:
- docker compose exec postgres bash -c "pg_dump --clean --dbname=$(POSTGRES_DB) -f /var/lib/postgresql/backups/backup-$(NOW_DB_PREFIX).sql"
- docker compose exec postgres bash -c "cp /var/lib/postgresql/backups/backup-$(NOW_DB_PREFIX).sql /var/lib/postgresql/backups/backup-latest.sql"

# imports database backup from data folder
# make import BACKUP_FILE=backup-2020-09-15-14:49:22.sql
# or
# imports database backup from data folder
# make import BACKUP_FILE=backup-2020-09-15-14:49:22.sql
# or
# make import BACKUP_FILE=backup-latest.sql
#import-postgres: backup-postgres

import-postgres:
import-postgres:
- docker compose exec postgres bash -c "psql --dbname=$(POSTGRES_DB) < /var/lib/postgresql/backups/$(BACKUP_FILE)"

init: docker-up switch-to-postgres composer-update migrate-fresh-quick

wait:
- docker compose exec api bash -c "./wait.sh"
wait:
- docker compose exec api bash -c "./wait.sh"
Loading