Skip to content

Commit

Permalink
AO3-6705 New docker syntax (#4783)
Browse files Browse the repository at this point in the history
  • Loading branch information
ceithir authored Apr 6, 2024
1 parent d40d751 commit 9894e31
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
7 changes: 3 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# webserver with the command:
#
# ```
# docker-compose up -d web
# docker compose up -d web
# ```
#
# Once it is running, it will be visible at http://localhost:3000/
Expand All @@ -18,17 +18,16 @@
# You can run tests like this:
#
# ```
# docker-compose run --rm test bundle exec cucumber features/other_a/autocomplete.feature
# docker compose run --rm test bundle exec cucumber features/other_a/autocomplete.feature
# ```

version: "3"
volumes:
my-datavolume:
redis-data:
esdata1:
services:
db:
image: mariadb:10.5.4-focal
image: mariadb:10.5.4-focal
environment:
- MYSQL_ROOT_PASSWORD=change_me
ports:
Expand Down
6 changes: 3 additions & 3 deletions script/docker/init.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ copy config\docker\database.yml config\database.yml
copy config\docker\redis.yml config\redis.yml
copy config\docker\local.yml config\local.yml

docker-compose up -d
docker compose up -d

timeout 60

docker-compose run --rm web script/reset_database.sh
docker compose run --rm web script/reset_database.sh

:: The development database reset will do everything except run migrations for
:: the test environment:
docker-compose run --rm test bundle exec rake db:migrate
docker compose run --rm test bundle exec rake db:migrate
6 changes: 3 additions & 3 deletions script/docker/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ do
cp "config/docker/$file" "config/$file"
done

docker-compose up -d
docker compose up -d

sleep 60

docker-compose run --rm web script/reset_database.sh
docker compose run --rm web script/reset_database.sh

# The development database reset will do everything except run migrations for
# the test environment:
docker-compose run --rm test bundle exec rake db:migrate
docker compose run --rm test bundle exec rake db:migrate

0 comments on commit 9894e31

Please sign in to comment.