Skip to content

Update middlewares to latest stable versions #1002

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jun 25, 2021
Merged

Update middlewares to latest stable versions #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82e7d83
Update middlewares to latest stable versions
manfred-martin-lyra Jun 23, 2021
9099437
adjust minimize-downtime for nginx-alpine
BYK Jun 25, 2021
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
12 changes: 6 additions & 6 deletions docker-compose.yml
View file
Open in desktop
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
View file
Open in desktop
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