diff --git a/cloudformation-template.yaml b/cloudformation-template.yaml index 14b1213..d5716cc 100644 --- a/cloudformation-template.yaml +++ b/cloudformation-template.yaml @@ -179,7 +179,7 @@ Parameters: # OpsWorks ClickHouse variables ClickHouseCookbookUrl: Type: String - Default: https://github.com/Rungutan/sentry-fargate-cf-stack/releases/download/1.15.0/clickhouse-1.15.0.tar.gz + Default: https://github.com/Rungutan/sentry-fargate-cf-stack/releases/download/1.15.1/clickhouse-1.15.1.tar.gz ClickHouseInstanceType: Type: String @@ -207,23 +207,23 @@ Parameters: SentryImage: Type: String - Default: rungutancommunity/sentry-base:1.15.0 + Default: rungutancommunity/sentry-base:1.15.1 SnubaImage: Type: String - Default: rungutancommunity/sentry-snuba:1.15.0 + Default: rungutancommunity/sentry-snuba:1.15.1 RelayImage: Type: String - Default: rungutancommunity/sentry-relay:1.15.0 + Default: rungutancommunity/sentry-relay:1.15.1 BashImage: Type: String - Default: rungutancommunity/bash:1.15.0 + Default: rungutancommunity/bash:1.15.1 ClickHouseImage: Type: String - Default: rungutancommunity/clickhouse-client:1.15.0 + Default: rungutancommunity/clickhouse-client:1.15.1 MinCountSnubaApi: Type: String @@ -2858,6 +2858,7 @@ Resources: processing: enabled: true + geoip_path: "/work/.relay/GeoLite2-City.mmdb" kafka_config: - name: "bootstrap.servers" diff --git a/docker/relay/Dockerfile b/docker/relay/Dockerfile index 17eb37d..fa96954 100644 --- a/docker/relay/Dockerfile +++ b/docker/relay/Dockerfile @@ -3,3 +3,5 @@ FROM getsentry/relay:21.6.2 COPY docker-alt-entrypoint.sh /docker-entrypoint.sh RUN mkdir -p /geoip/ + +COPY GeoLite2-City.mmdb /geoip/GeoLite2-City.mmdb diff --git a/docker/relay/GeoLite2-City.mmdb b/docker/relay/GeoLite2-City.mmdb new file mode 100644 index 0000000..adfd779 Binary files /dev/null and b/docker/relay/GeoLite2-City.mmdb differ diff --git a/docker/relay/docker-alt-entrypoint.sh b/docker/relay/docker-alt-entrypoint.sh index 418579c..e9c8854 100755 --- a/docker/relay/docker-alt-entrypoint.sh +++ b/docker/relay/docker-alt-entrypoint.sh @@ -12,6 +12,7 @@ fi # If tmp config folder found, copy file from there to work folder mkdir -p /work/.relay/ && chown -R relay:relay /work (cp ${CONFIG_FILE_PATH} /work/.relay/config.yml) || true +(cp /geoip/GeoLite2-City.mmdb /work/.relay/GeoLite2-City.mmdb) || true # For compatibility with older images if [ "$1" == "bash" ]; then