Skip to content

Commit 54e14c4

Browse files
committed
Use 'docker compose' in init-dockerdata.sh script
This switches the init-dockerdata.sh script so that it uses "docker compose" (v2) instead of "docker-compose" (v1). I had switched the docker-compose.sh shell script to use v2 a while ago but neglected to make the same change to init-dockerdata.sh. I only realized my mistake now while configuring GitHub actions. Building the 'manage-test' service using docker-compose.sh and then running init-dockerdata.sh caused that service to get built twice. Changing to "docker compose" in init-dockerdata.sh fixes the issue.
1 parent 7f92e0e commit 54e14c4

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

init-dockerdata.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ function show_summary {
122122
# even though it still doesn't exist in /etc/passwd.
123123
function warm_up_sierra_db_test {
124124
echo "Initializing PostgreSQL database for \`sierra-db-test\` service"
125-
local container=$(docker-compose run -u root -d sierra-db-test)
125+
local container=$(docker compose run -u root -d sierra-db-test)
126126
#container="${container##*$'\n'}"
127127
container=$(echo "$container" | tail -1)
128128
printf "(waiting for database) ..."
@@ -140,7 +140,7 @@ function warm_up_sierra_db_test {
140140
echo "Stopping intermediate container."
141141
sleep 2; docker stop $container && docker rm $container &> /dev/null; sleep 2;
142142
echo "Changing ownership of pgdata directory to current user."
143-
docker-compose run --rm -u root --entrypoint="sh -c \"chown -R $USERID:$GROUPID /var/lib/postgresql/data\"" sierra-db-test
143+
docker compose run --rm -u root --entrypoint="sh -c \"chown -R $USERID:$GROUPID /var/lib/postgresql/data\"" sierra-db-test
144144
echo "Done. Database initialized."
145145
return 0
146146
}
@@ -257,19 +257,19 @@ function prepvolume_solr_dev {
257257
# whether the volume is ready for migrations or not.
258258

259259
function migrate_default_db_dev {
260-
docker-compose run --rm manage-dev migrate --database=default
260+
docker compose run --rm manage-dev migrate --database=default
261261
}
262262

263263
function migrate_default_db_test {
264-
docker-compose run --rm manage-test migrate --run-syncdb --database=default
264+
docker compose run --rm manage-test migrate --run-syncdb --database=default
265265
}
266266

267267
function migrate_sierra_db_test {
268268
local volume_is_ready=$1
269269
if [[ $volume_is_ready ]]; then
270-
docker-compose run --rm manage-test migrate --run-syncdb --database=sierra
270+
docker compose run --rm manage-test migrate --run-syncdb --database=sierra
271271
echo "Installing sierra-db-test fixtures..."
272-
docker-compose run --rm manage-test loaddata --app=base --database=sierra $(find $SIERRA_FIXTURE_PATH/*.json -exec basename {} .json \; | tr '\n' ' ')
272+
docker compose run --rm manage-test loaddata --app=base --database=sierra $(find $SIERRA_FIXTURE_PATH/*.json -exec basename {} .json \; | tr '\n' ' ')
273273
else
274274
echo "Warning: Database could not be initialized; skipping migrations for \`sierra-db-test\`"
275275
fi
@@ -343,7 +343,7 @@ actions=$([[ $want_make_volumes ]] && echo "v")$([[ $want_do_migrations ]] && ec
343343
show_summary $actions "${user_services[*]}" $force
344344

345345
echo "Stopping any running catalog-api Docker services ..."
346-
docker-compose down &> /dev/null
346+
docker compose down &> /dev/null
347347

348348
# First, loop over user-provided $user_services. Validate each service and set
349349
# volumes up as appropriate
@@ -415,7 +415,7 @@ fi
415415

416416
echo ""
417417
echo "Done. Stopping all running services."
418-
docker-compose down &> /dev/null
418+
docker compose down &> /dev/null
419419
echo ""
420420
echo "$SCRIPTNAME finished."
421421
echo ""

0 commit comments

Comments
 (0)