Skip to content

Commit

Permalink
chore: update php + wordpress versions
Browse files Browse the repository at this point in the history
- modified Dockerfile to support updated php & wordpress versions
- modified composer.json to support updated php version
  • Loading branch information
theogainey committed Sep 19, 2023
1 parent f110792 commit c9d7f6d
Show file tree
Hide file tree
Showing 6 changed files with 438 additions and 356 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ version: 2.1
jobs:
build:
docker:
- image: circleci/php:7.1-node-browsers
- image: circleci/php:8.1-node-browsers
environment:
# When changing, also change in Dockerfile
WP_VERSION: 5.5
WP_VERSION: 6.3.1
CC_TEST_REPORTER_ID: e0f9cea32e63c566325e5e215707327897269674b0ab91f57e4326612ef5dcc8
steps:
- run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Install PHP dependencies with Composer
uses: php-actions/composer@v6
with:
php_version: '7.4'
php_version: '8.1'
version: 2.x

- name: Install npm dependencies
Expand Down
8 changes: 3 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
FROM php:7.3-apache-buster
FROM php:8.1-apache-buster

# When changings, also change in .circleci/config.yml
ENV WP_VERSION=5.5
ENV WP_VERSION=6.3.1

RUN apt-get update \
&& apt-get install -y libpng-dev libjpeg62-turbo-dev libzip-dev

RUN docker-php-ext-configure gd --with-jpeg-dir=/usr/include/
RUN docker-php-ext-configure gd --with-jpeg
RUN docker-php-ext-install gd mysqli pdo_mysql zip

RUN docker-php-ext-configure zip --with-libzip

# These apache modules are required and not enabled by default in this image
RUN a2enmod rewrite headers xml2enc proxy proxy_fcgi

Expand Down
13 changes: 6 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"type": "library",
"description": "Starter Docker installation for WordPress Websites",
"require": {
"php": ">=5.6",
"vlucas/phpdotenv": "4.1.1",
"php": "^8.1",
"vlucas/phpdotenv": "4.3",
"wpackagist-plugin/wordpress-seo": "^18.0",
"wpackagist-plugin/meta-box": "^5.3",
"timber/timber": "^1.18",
"friendsoftwig/twigcs": "^3.2"
"friendsoftwig/twigcs": "^5.2"
},
"repositories":[
{
Expand All @@ -18,16 +18,15 @@
],
"require-dev": {
"squizlabs/php_codesniffer": "*",
"wp-coding-standards/wpcs": "^2.2"
"wp-coding-standards/wpcs": "^3.0.0"
},
"config": {
"allow-plugins": {
"composer/installers": true
"composer/installers": true,
"dealerdirect/phpcodesniffer-composer-installer": true
}
},
"scripts": {
"post-install-cmd": "vendor/squizlabs/php_codesniffer/bin/phpcs --config-set installed_paths vendor/wp-coding-standards/wpcs",
"post-update-cmd" : "vendor/squizlabs/php_codesniffer/bin/phpcs --config-set installed_paths vendor/wp-coding-standards/wpcs",
"lint:wpcs": "vendor/squizlabs/php_codesniffer/bin/phpcs --standard=sparkpress-standard.xml --extensions=php ./src/php"
}
}
Loading

0 comments on commit c9d7f6d

Please sign in to comment.