Skip to content

Commit

Permalink
Merge pull request #732 from boxuk/BWP-123
Browse files Browse the repository at this point in the history
[BWP-123] Remove Memcache/Object Caching
  • Loading branch information
jdamner authored Jan 17, 2025
2 parents 658c316 + 8e7950f commit c5c9151
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 441 deletions.
10 changes: 1 addition & 9 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,7 @@ updates:
open-pull-requests-limit: 10
commit-message:
prefix: "[SETUP]"
# Docker memcached image.
- package-ecosystem: docker
directory: "/docker/memcached"
registries: "*"
schedule:
interval: daily
open-pull-requests-limit: 10
commit-message:
prefix: "[SETUP]"

# Docker nginx image.
- package-ecosystem: docker
directory: "/docker/nginx"
Expand Down
2 changes: 0 additions & 2 deletions bin/install
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ mv wp-content/mu-plugins-disabled wp-content/mu-plugins
echo 'Flushing cache...'
bin/docker/wp cache flush;

cp wp-content/plugins/wp-memcached/object-cache.php wp-content/object-cache.php

while true; do
read -p "Do you wish to add a hosts entry (you will be prompted for password twice)? [Y/N]" yn

Expand Down
10 changes: 0 additions & 10 deletions compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ services:
condition: service_healthy
mailpit:
condition: service_healthy
memcached:
condition: service_healthy
links:
- app
networks:
Expand All @@ -82,14 +80,6 @@ services:
- '.:/usr/src/app:cached'
- './node_modules:/usr/src/app/node_modules:delegated'

memcached:
build: docker/memcached
healthcheck:
test: ["CMD", "echo", "stats", "|", "nc", "localhost", "11211"]
interval: 10s
timeout: 5s
retries: 3

volumes:
maildata:

Expand Down
6 changes: 0 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
"type": "composer",
"url": "https://wpackagist.org"
},
{
"type": "git",
"url": "https://github.com/automattic/wp-memcached"
},
{
"options": {
"symlink": false
Expand Down Expand Up @@ -45,10 +41,8 @@
}
},
"require": {
"automattic/wp-memcached": "^4.0",
"boxuk/wp-editor-tools": "^0.0.10",
"boxuk/wp-feature-flags": "^0.0.10",
"cache/memcache-adapter": "^1.2",
"inpsyde/wp-translation-downloader": "^2.5",
"oomphinc/composer-installers-extender": "^2",
"roots/bedrock-autoloader": "^1.0",
Expand Down
Loading

0 comments on commit c5c9151

Please sign in to comment.