Skip to content

Fix integration tests #842

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.

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

Open
wants to merge 4 commits into
base: trunk
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ common_params:
# - '6.3'
# - '6.4'
# - '6.5'
- '6.6'
# - '6.6'
- '6.8.1'

steps:
#
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ services:
build:
context: .
dockerfile: wordpress.Dockerfile
args:
WORDPRESS_VERSION: ${WORDPRESS_VERSION:-latest}
container_name: 'wordpress'
ports:
- '80:80'
Expand Down
7 changes: 3 additions & 4 deletions scripts/setup-test-site.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

# This script sets up a WordPress test site on the `wordpress` docker image.
# This script sets up a WordPress test site on the `wordpress` docker image.
# You might wonder "why not do this work once, then just import the database for each run?"
# We do each step each time for each build because we're trying to get a "mint" condition site
# for each WordPress version – if there are issues with DB migrations, different default themes
Expand All @@ -19,7 +19,7 @@ tries=0
while true; do

code=0
wp db check || code=$?
wp db check --skip-ssl || code=$?

if [ $code == 0 ]; then
echo 'Database Ready'
Expand Down Expand Up @@ -169,5 +169,4 @@ wp option update timezone_string "America/New_York"

cp -rp wp-content/plugins wp-content/plugins-backup

wp db export --add-drop-table wp-content/dump.sql

wp db export --skip-ssl --add-drop-table wp-content/dump.sql
6 changes: 4 additions & 2 deletions wordpress.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
FROM public.ecr.aws/docker/library/wordpress:${WORDPRESS_VERSION:-latest}
ARG WORDPRESS_VERSION="latest"

FROM public.ecr.aws/docker/library/wordpress:${WORDPRESS_VERSION}

RUN apt-get update \
&& apt-get install -y wget gpg

# https://docs.aws.amazon.com/corretto/latest/corretto-21-ug/generic-linux-install.html
# To use the Corretto Apt repositories on Debian-based systems, such as Ubuntu, import the \
# Corretto public key and then add the repository to the system list by using the following commands:
# Corretto public key and then add the repository to the system list by using the following commands:
RUN wget -O - https://apt.corretto.aws/corretto.key | gpg --dearmor -o /usr/share/keyrings/corretto-keyring.gpg && \
echo "deb [signed-by=/usr/share/keyrings/corretto-keyring.gpg] https://apt.corretto.aws stable main" | tee /etc/apt/sources.list.d/corretto.list

Expand Down