Skip to content

Commit d04080c

Browse files
committed
chore(dev): improve mysql handling in tasks
1 parent 2f69c3e commit d04080c

3 files changed

Lines changed: 15 additions & 5 deletions

File tree

bin/wp-down.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
#!/usr/bin/env bash
2-
docker compose -f $DOCKER_FILE down
3-
docker volume prune --force
2+
set -euo pipefail
3+
4+
: "${DOCKER_FILE:=docker-compose.ci.yml}"
5+
6+
docker compose -f "$DOCKER_FILE" down
7+
docker volume prune --force

bin/wp-init.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
#!/usr/bin/env bash
2+
set -euo pipefail
23

3-
docker compose -f $DOCKER_FILE up -d
4+
: "${DOCKER_FILE:=docker-compose.ci.yml}"
5+
6+
docker compose -f "$DOCKER_FILE" up -d mysql wordpress
47
# Wait for mysql container to be ready.
5-
while docker compose -f $DOCKER_FILE run --rm -u root cli wp --allow-root db check ; [ $? -ne 0 ]; do
8+
while docker compose -f "$DOCKER_FILE" run --rm --use-aliases -u root cli wp --allow-root db check ; [ $? -ne 0 ]; do
69
echo "Waiting for db to be ready... "
710
sleep 1
811
done
912
# install WP
10-
docker compose -f $DOCKER_FILE run --rm -u root cli bash -c "/var/www/html/bin/cli-setup.sh"
13+
docker compose -f "$DOCKER_FILE" run --rm --use-aliases -u root cli bash -c "/var/www/html/bin/cli-setup.sh"

docker-compose.ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@ services:
2020
- wpcore:/var/www/html/
2121
- .:/var/www/html/wp-content/plugins/visualizer/
2222
depends_on:
23+
- mysql
2324
- wordpress
2425
environment:
2526
- WORDPRESS_DB_NAME=wordpress
2627
- WORDPRESS_DB_USER=root
2728
- WORDPRESS_DB_PASSWORD=wordpress
2829
- WORDPRESS_DB_ROOT_PASSWORD=wordpress
30+
- WORDPRESS_DB_HOST=mysql
2931
- WORDPRESS_DEBUG=1
3032
wordpress:
3133
privileged: true
@@ -44,6 +46,7 @@ services:
4446
WORDPRESS_DB_USER: wordpress
4547
WORDPRESS_DB_PASSWORD: wordpress
4648
WORDPRESS_DB_ROOT_PASSWORD: wordpress
49+
WORDPRESS_DB_HOST: mysql
4750
WORDPRESS_DEBUG: 1
4851

4952
volumes:

0 commit comments

Comments
 (0)