Skip to content

Commit

Permalink
Update composer (#489)
Browse files Browse the repository at this point in the history
* Attempt fix for dev deploy

* Update composer

* Add xdebug to dev target

* Add xdebug to dev target

* Slight optimise
  • Loading branch information
wilson1000 authored Mar 26, 2024
1 parent b094ca3 commit 57448cf
Show file tree
Hide file tree
Showing 5 changed files with 184 additions and 446 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ USER 82

## target: dev
FROM base-fpm AS dev
RUN apk add --update nano nodejs npm
RUN apk add --update nodejs npm

COPY --from=composer:2 /usr/bin/composer /usr/bin/composer

Expand All @@ -37,8 +37,8 @@ WORKDIR /var/www/html
COPY --from=composer:2 /usr/bin/composer /usr/bin/composer

COPY ./bin/composer-auth.sh /var/www/html/composer-auth.sh
RUN chmod +x /var/www/html/composer-auth.sh
RUN /var/www/html/composer-auth.sh
RUN chmod +x /var/www/html/composer-auth.sh && \
/var/www/html/composer-auth.sh

# non-root
USER 82
Expand Down
27 changes: 15 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,26 +46,26 @@
"roots/bedrock-autoloader": "^1.0",
"roots/bedrock-disallow-indexing": "^2.0",
"roots/wordpress": "^6.4",
"roots/wp-password-bcrypt": "*",
"roots/wp-password-bcrypt": "^1.1.0",
"roots/wp-config": "^1.0",
"wpackagist-plugin/classic-editor": "*",
"wpackagist-plugin/totalpoll-lite": "*",
"wpackagist-plugin/cms-tree-page-view": "*",
"wpackagist-plugin/co-authors-plus": "*",
"wpackagist-plugin/ewww-image-optimizer": "*",
"wpackagist-plugin/classic-editor": "^1.6.0",
"wpackagist-plugin/totalpoll-lite": "^4.10.0",
"wpackagist-plugin/cms-tree-page-view": "^1.6.0",
"wpackagist-plugin/co-authors-plus": "^3.5.0",
"wpackagist-plugin/ewww-image-optimizer": "^7.4.0",
"wpackagist-plugin/wp-document-revisions": "^3.5.0",
"wpackagist-plugin/simple-301-redirects":"2.0.9",
"acf/advanced-custom-fields-pro": "*",
"wpackagist-plugin/simple-301-redirects": "2.0.9",
"acf/advanced-custom-fields-pro": "^6.1.0",
"ministryofjustice/wp-rewrite-media-to-s3": "dev-php8-code-update",
"ministryofjustice/like-button-for-wordpress": "dev-main",
"ministryofjustice/notify-for-wordpress": "dev-main",
"ministryofjustice/php-markdown-extra": "dev-main",
"ministryofjustice/wp-moj-components": "*",
"ministryofjustice/wp-moj-elasticsearch": "*",
"wpackagist-plugin/elasticpress": "*",
"ministryofjustice/wp-moj-components": "^3.5.0",
"ministryofjustice/wp-moj-elasticsearch": "^2.3.0",
"wpackagist-plugin/elasticpress": "^5.0.0",
"ext-zlib": "*",
"ext-posix": "*",
"sentry/sdk": "^3.1",
"sentry/sentry": "^3.1",
"php-http/guzzle7-adapter": "^1.0",
"alphagov/notifications-php-client": "^5.0",
"aws/aws-sdk-php": "^3.133",
Expand All @@ -76,6 +76,9 @@
"wpackagist-plugin/amazon-s3-and-cloudfront": "^3.2"
},
"require-dev": {
"wpackagist-plugin/query-monitor": "^3.15.0",
"wpackagist-plugin/debug-bar": "^1.1.0",
"wpackagist-plugin/debug-bar-elasticpress": "^3.1.0",
"squizlabs/php_codesniffer": "^3.0.2"
},
"extra": {
Expand Down
Loading

0 comments on commit 57448cf

Please sign in to comment.