Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump mariadb version to fix dev and e2e docker setup #3665

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
+8 −8
Open

Bump mariadb version to fix dev and e2e docker setup #3665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82573e4
Bump mariadb version
annemirasol Dec 17, 2024
507dac5
Change to docker compose
annemirasol Dec 17, 2024
676c0e3
Merge branch 'develop' into dev/gh-worfklow-container
Mayisha Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
- "host.docker.internal:host-gateway"
db:
container_name: woocommerce_stripe_mysql
image: mariadb:10.5.8
image: mariadb:latest
ports:
- "5678:3306"
env_file:
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/bin/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ for arg in "$@"; do
fi
done

if [[ *"wordpress" == "$(docker-compose -p wcstripe-e2e ps --services --filter "status=running" | grep wordpress)" ]]; then
if [[ *"wordpress" == "$(docker compose -p wcstripe-e2e ps --services --filter "status=running" | grep wordpress)" ]]; then
error "Docker E2E containers are not running, please start them with 'npm run test:e2e-up' or 'npm run test:e2e-setup' and try again."
exit 1
fi
Expand Down
8 changes: 4 additions & 4 deletions tests/e2e/bin/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fi
step "Starting E2E docker containers"
CWD="$CWD" E2E_ROOT="$E2E_ROOT" redirect_output docker compose -p wcstripe-e2e -f "$E2E_ROOT"/env/docker-compose.yml up --build --force-recreate -d wordpress

step "Configuring Wordpress"
step "Configuring WordPress"
# Wait for containers to be started up before setup.
# The db being accessible means that the db container started and the WP has been downloaded and the plugin linked
set +e
Expand All @@ -58,10 +58,10 @@ redirect_output cli wp core install \
--skip-email

if [[ -n "$WP_VERSION" && "$WP_VERSION" != "latest" ]]; then
echo " - Installing Wordpress ${WP_VERSION}..."
echo " - Installing WordPress ${WP_VERSION}..."
redirect_output cli wp core update --version="$WP_VERSION" --force --quiet
else
echo " - Updating Wordpress to the latest version"
echo " - Updating WordPress to the latest version"
redirect_output cli wp core update --quiet
fi

Expand All @@ -74,7 +74,7 @@ redirect_output cli wp config set WP_DEBUG false --raw
echo " - Updating permalink structure"
redirect_output cli wp rewrite structure '/%postname%/'

echo " - Installing Wordpress Importer"
echo " - Installing WordPress Importer"
redirect_output cli wp plugin install wordpress-importer --activate

echo " - Disable emails to avoid spamming"
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/env/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
volumes:
# Kludge for not having the ./docker directory bound recursively
dockerdirectory:

services:
wordpress:
build: .
Expand All @@ -24,7 +24,7 @@ services:
- "host.docker.internal:host-gateway"
db:
container_name: wcstripe-e2e-mysql
image: mariadb:10.5.8
image: mariadb:latest
ports:
- "6789:3306"
env_file:
Expand Down
Loading