Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: xwp/vip-site-template
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 65895af29984cbc9e62f181f72fae1b2a2c3c73a
Choose a base ref
..
head repository: xwp/vip-site-template
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bc7d7b97162e0cc43d8d1fc6bee4df1f9f978108
Choose a head ref
Showing with 42 additions and 41 deletions.
  1. +1 −1 composer.json
  2. +39 −38 composer.lock
  3. +2 −2 local/docker/wordpress/Dockerfile
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@
"automattic/vipwpcs": "^3.0",
"dealerdirect/phpcodesniffer-composer-installer": "^1.0",
"johnpbloch/wordpress": "dev-master",
"phpunit/phpunit": "^9.6.19",
"phpunit/phpunit": "^9.6.20",
"wp-cli/wp-cli-bundle": "^2.8",
"wp-phpunit/wp-phpunit": "^6.4.2",
"xwp/wait-for": "^0.0.2",
77 changes: 39 additions & 38 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions local/docker/wordpress/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -21,15 +21,15 @@ RUN sed -i 's#/var/www#\${APACHE_DOCUMENT_ROOT}#g' /etc/apache2/apache2.conf /et
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
curl pv bash less default-mysql-client ssh git zip unzip sudo gnupg \
msmtp libz-dev libmemcached-dev libsecret-1-0 \
msmtp libz-dev libmemcached-dev libsecret-1-0 libssl-dev \
&& rm -rf /var/lib/apt/lists/*

# Install Node.js per recommended setup.
RUN mkdir -p /etc/apt/keyrings \
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_${NODE_VERSION}.x nodistro main" >> /etc/apt/sources.list.d/nodesource.list \
&& apt-get update \
&& apt-get -y --no-install-recommends install nodejs npm \
&& apt-get -y --no-install-recommends install nodejs \
&& rm -rf /var/lib/apt/lists/*

# Install PHP Composer.