diff --git a/.atlas b/.atlas index 85a5e001c..ea348486c 100644 --- a/.atlas +++ b/.atlas @@ -1 +1 @@ -0.0.150 +0.0.153 diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 7607bdb81..818311ffc 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -34,10 +34,9 @@ jobs: run: | set -x ATLAS=$(cat .atlas) docker compose -f docker-compose.yml -f docker-compose.ci.yml up -d - - name: Create database and migrate - run: | - docker compose exec -T web bundle exec rake db:create - docker compose exec -T web bundle exec rake db:migrate + # - name: Create database and migrate + # run: | + # docker compose exec -T web bundle exec rake db:migrate - name: Wait until available run: dockerize -wait http://localhost:3000 -timeout 1m - name: Run tests diff --git a/.version b/.version index a534775a0..fef250dd2 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.6.22 +2.6.23 diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index d48782efa..a4e2211f6 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -1,5 +1,6 @@ #!/bin/bash -bin/rails db:migrate RAILS_ENV=development +bin/rails db:create +bin/rails db:migrate rm -f /home/cerberus/web/tmp/pids/server.pid rails dartsass:watch & rails s -p 3000 -b '0.0.0.0'