Skip to content
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

Upgrade postgres, open search and redis #6605

Merged
Merged
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ docker-e2e = docker-compose -p dh -f docker-compose.base.yml -f docker-compose.e
docker-dev = COMPOSE_HTTP_TIMEOUT=300 docker-compose -p dh -f docker-compose.base.yml -f docker-compose.frontend.dev.yml
docker-storybook = docker-compose -p dh -f docker-compose.storybook.yml

wait-for-frontend = dockerize -wait tcp://localhost:3000/healthcheck -timeout 5m -wait-retry-interval 5s
wait-for-frontend = dockerize -wait tcp://localhost:3000/pingdom -timeout 5m -wait-retry-interval 5s
wait-for-storybook = dockerize -wait tcp://localhost:65200 -timeout 5m -wait-retry-interval 5s
wait-for-redis = dockerize -wait tcp://redis:6379 -timeout 5m

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ services:
command: npm run develop

redis:
image: redis:6.2.6
image: redis:7.2.4
6 changes: 3 additions & 3 deletions docker-compose.e2e.backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ services:
command: python short-running-worker.py long-running-worker.py

postgres:
image: postgres:12
image: postgres:16
ports:
- "5432:5432"
environment:
Expand All @@ -54,7 +54,7 @@ services:
POSTGRES_PASSWORD: password

opensearch:
image: opensearchproject/opensearch:1.2.4
image: opensearchproject/opensearch:2.11.0
ports:
- '9200:9200'
- '9300:9300'
Expand All @@ -69,7 +69,7 @@ services:
activity-feed-reverseproxy:
build: ./test/end-to-end/proxy
ports:
- 8081:8081
- 8081:8081
depends_on:
- activity-feed

Expand Down
8 changes: 3 additions & 5 deletions docker-compose.services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,11 @@ services:
- 8001:8001
depends_on:
- lbdb
command: >
bash -c "sleep 5 && python manage.py migrate &&
python manage.py collectstatic --noinput &&
python -Wd manage.py runserver 0.0.0.0:8001"
command: >
bash -c "sleep 5 && python manage.py migrate && python manage.py collectstatic --noinput && python -Wd manage.py runserver 0.0.0.0:8001"

lbdb:
image: postgres:9.6.9-alpine
image: postgres:16
restart: unless-stopped
environment:
POSTGRES_USER: postgres
Expand Down
2 changes: 1 addition & 1 deletion manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ applications:
- buildpacks:
- https://github.com/cloudfoundry/nodejs-buildpack.git#v1.8.11
health-check-type: http
health-check-http-endpoint: /healthcheck
health-check-http-endpoint: /pingdom
memory: 5G
disk_quota: 8G
stack: cflinuxfs4
2 changes: 1 addition & 1 deletion src/apps/healthcheck/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const router = require('./router')

module.exports = {
mountpath: '/healthcheck',
mountpath: '/pingdom',
router: router,
}
2 changes: 1 addition & 1 deletion src/apps/healthcheck/serviceDependencies.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const redisClient = require('../../lib/redis-client')
module.exports = [
{
name: 'api',
healthCheck: () => axios.get(`${config.apiRoot}/ping.xml`),
healthCheck: () => axios.get(`${config.apiRoot}/pingdom/ping.xml`),
},
{
name: 'redis',
Expand Down
3 changes: 1 addition & 2 deletions src/middleware/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ const PUBLICLY_ACCESSIBLE_API_ENDPOINTS = [
const REGEX = new RegExp(PUBLICLY_ACCESSIBLE_API_ENDPOINTS.join('|'))

module.exports = function auth(req, res, next) {
const passThrough =
req.session.token || /^\/(healthcheck|oauth)\b/.test(req.url)
const passThrough = req.session.token || /^\/(pingdom|oauth)\b/.test(req.url)

if (passThrough) {
return next()
Expand Down
2 changes: 1 addition & 1 deletion src/middleware/features.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function parseFeatureData(featureData = []) {
module.exports = async function features(req, res, next) {
try {
const passThrough =
!req.session.token || /^\/(support|healthcheck|oauth)\b/.test(req.url)
!req.session.token || /^\/(support|pingdom|oauth)\b/.test(req.url)

if (passThrough) {
res.locals.features = {}
Expand Down
Loading