diff --git a/Makefile b/Makefile index d85fb8c..05cf5e4 100644 --- a/Makefile +++ b/Makefile @@ -4,61 +4,61 @@ GROUP=$(shell id -gn) APPDIR=$(PWD) install: - docker-compose run --rm runner bundle install - docker-compose run --rm runner yarn install + docker compose run --rm runner bundle install + docker compose run --rm runner yarn install start: - docker-compose up rails css js sidekiq + docker compose up rails css js sidekiq clear-jobs: - docker-compose run --rm runner bundle exec rails runner 'Sidekiq.redis { |conn| conn.flushdb }' + docker compose run --rm runner bundle exec rails runner 'Sidekiq.redis { |conn| conn.flushdb }' db-reset: - docker-compose run --rm runner bundle exec rails db:drop - docker-compose run --rm -e RAILS_ENV=test runner bundle exec rails db:drop + docker compose run --rm runner bundle exec rails db:drop + docker compose run --rm -e RAILS_ENV=test runner bundle exec rails db:drop db-prepare: db-reset - docker-compose run --rm runner bundle exec rails db:create db:migrate db:seed - docker-compose run --rm -e RAILS_ENV=test runner bundle exec rails db:create db:migrate + docker compose run --rm runner bundle exec rails db:create db:migrate db:seed + docker compose run --rm -e RAILS_ENV=test runner bundle exec rails db:create db:migrate db-migrate: - docker-compose run --rm runner bundle exec rails db:create db:migrate - docker-compose run --rm -e RAILS_ENV=test runner bundle exec rails db:migrate + docker compose run --rm runner bundle exec rails db:create db:migrate + docker compose run --rm -e RAILS_ENV=test runner bundle exec rails db:migrate db-open: - docker-compose run --rm runner bundle exec rails db -p + docker compose run --rm runner bundle exec rails db -p stop: - docker-compose down + docker compose down test: - docker-compose up -d chrome - docker-compose run --rm -e RAILS_ENV=test runner bundle exec rspec $(filter-out $@,$(MAKECMDGOALS)) + docker compose up -d chrome + docker compose run --rm -e RAILS_ENV=test runner bundle exec rspec $(filter-out $@,$(MAKECMDGOALS)) cons: - docker-compose run --rm runner bundle exec rails console + docker compose run --rm runner bundle exec rails console dive: - docker-compose run --rm runner bash + docker compose run --rm runner bash lint: - docker-compose run --rm runner bundle exec rake standard - docker-compose run --rm runner bundle exec erblint --lint-all + docker compose run --rm runner bundle exec rake standard + docker compose run --rm runner bundle exec erblint --lint-all lint-fix: - docker-compose run --rm runner bundle exec rake standard:fix - docker-compose run --rm runner bundle exec erblint --lint-all --auto + docker compose run --rm runner bundle exec rake standard:fix + docker compose run --rm runner bundle exec erblint --lint-all --auto change-secrets: - docker-compose run --rm runner bundle exec rails credentials:edit --environment=$(filter-out $@,$(MAKECMDGOALS)) + docker compose run --rm runner bundle exec rails credentials:edit --environment=$(filter-out $@,$(MAKECMDGOALS)) sudo chown -R $(USER):$(GROUP) . g: - docker-compose run --rm runner bundle exec rails g $(filter-out $@,$(MAKECMDGOALS)) + docker compose run --rm runner bundle exec rails g $(filter-out $@,$(MAKECMDGOALS)) sudo chown -R $(USER):$(GROUP) . d: - docker-compose run --rm runner bundle exec rails d $(filter-out $@,$(MAKECMDGOALS)) + docker compose run --rm runner bundle exec rails d $(filter-out $@,$(MAKECMDGOALS)) %: @: diff --git a/dependencies.sh b/dependencies.sh index 2743da7..0b59782 100644 --- a/dependencies.sh +++ b/dependencies.sh @@ -17,9 +17,9 @@ update_versions() { } rebuild_images() { - docker-compose down + docker compose down docker rmi $(docker images 'lightning-rails' -a -q) -f - docker-compose build runner + docker compose build runner make install }