Skip to content

Commit

Permalink
Update middlewares to latest stable versions (getsentry#1002)
Browse files Browse the repository at this point in the history
This PR is a try to update most middlewares used by Sentry to latest stable versions.
[As mentioned in the forum](https://forum.sentry.io/t/middleware-version-compatibility/14353/2) I didn't update Postgresql & Clickhouse due to known issues.

I also :
- changed versions to immutable tags (MAJOR.MINOR.PATCH semver versions when possible).
- changed nginx to the Alpine variant
  • Loading branch information
fmartinou authored Jun 25, 2021
1 parent 1d49629 commit f541117
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ services:
- "sentry-smtp-log:/var/log/exim4"
memcached:
<<: *restart_policy
image: "memcached:1.5-alpine"
image: "memcached:1.6.9-alpine"
healthcheck:
# From: https://stackoverflow.com/a/31877626/5155484
test: echo stats | nc 127.0.0.1 11211
Expand All @@ -68,7 +68,7 @@ services:
start_period: 3s
redis:
<<: *restart_policy
image: "redis:5.0-alpine"
image: "redis:6.2.4-alpine"
healthcheck:
test: redis-cli ping
interval: 2s
Expand Down Expand Up @@ -103,7 +103,7 @@ services:
target: /opt/sentry/
zookeeper:
<<: *restart_policy
image: "confluentinc/cp-zookeeper:5.5.0"
image: "confluentinc/cp-zookeeper:6.2.0"
environment:
ZOOKEEPER_CLIENT_PORT: "2181"
CONFLUENT_SUPPORT_METRICS_ENABLE: "false"
Expand All @@ -123,7 +123,7 @@ services:
<<: *restart_policy
depends_on:
- zookeeper
image: "confluentinc/cp-kafka:5.5.0"
image: "confluentinc/cp-kafka:6.2.0"
environment:
KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181"
KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://kafka:9092"
Expand Down Expand Up @@ -165,7 +165,7 @@ services:
# You might want to change this to a higher value (and ensure your host has enough memory)
MAX_MEMORY_USAGE_RATIO: 0.3
geoipupdate:
image: "maxmindinc/geoipupdate:latest"
image: "maxmindinc/geoipupdate:v4.7.1"
# Override the entrypoint in order to avoid using envvars for config.
# Futz with settings so we can keep mmdb and conf in same dir on host
# (image looks for them in separate dirs by default).
Expand Down Expand Up @@ -272,7 +272,7 @@ services:
<<: *restart_policy
ports:
- "$SENTRY_BIND:80/tcp"
image: "nginx:1.16"
image: "nginx:1.21.0-alpine"
volumes:
- type: bind
read_only: true
Expand Down
2 changes: 1 addition & 1 deletion install/wrap-up.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ if [[ "$MINIMIZE_DOWNTIME" ]]; then

# Start the whole setup, except nginx and relay.
$dc up -d --remove-orphans $($dc config --services | grep -v -E '^(nginx|relay)$')
$dc exec -T nginx service nginx reload
$dc exec -T nginx nginx -s reload

docker run --rm --network="${COMPOSE_PROJECT_NAME}_default" alpine ash \
-c 'while [[ "$(wget -T 1 -q -O- http://web:9000/_health/)" != "ok" ]]; do sleep 0.5; done'
Expand Down

0 comments on commit f541117

Please sign in to comment.