diff --git a/Dockerfile b/Dockerfile index c6ddc90..337a20b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,6 +26,7 @@ RUN true \ postgresql-dev \ librdkafka \ jansson \ + bash \ && rm -rf \ /etc/nginx/conf.d/default.conf \ && mkdir -p \ @@ -68,7 +69,7 @@ RUN true \ && echo 'INPUT ( libldap.so )' > /usr/lib/libldap_r.so \ && pip install \ cairocffi==1.1.0 \ - django==2.2.26 \ + django==2.2.27 \ django-statsd-mozilla \ fadvise \ gunicorn==20.1.0 \ @@ -123,12 +124,12 @@ RUN git clone "${statsd_repo}" \ # build go-carbon (optional) # https://github.com/go-graphite/go-carbon/pull/340 -ARG gocarbon_version=0.15.6 +ARG gocarbon_version=0.16.2 ARG gocarbon_repo=https://github.com/go-graphite/go-carbon.git RUN git clone "${gocarbon_repo}" /usr/local/src/go-carbon \ && cd /usr/local/src/go-carbon \ && git checkout tags/v"${gocarbon_version}" \ - && make \ + && make go-carbon \ && chmod +x go-carbon && mkdir -p /opt/graphite/bin/ \ && cp -fv go-carbon /opt/graphite/bin/go-carbon \ || true diff --git a/README.md b/README.md index acb5946..898a901 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ Any suggestions / patches etc. are welcome! - Starting from `1.1.7-1` we're building arm/arm64 versions too. - Starting from `1.1.7-11` we're building linux/s390x versions too. - Starting from `1.1.7-6` and up to `1.1.8-5` we were building '-pypy' version of x64 image, but now pypy building is disabled because lacking recent pypy docker images based on Alpine. - - Starting from `1.1.9-1` we're building we're building linux/arm/v7 and linux/arm64/v8 by default. - - Starting from `1.1.9-1` we're uploading packages also to ghcr.io/deniszh repository. + - Starting from `1.1.8-8` we're building linux/arm/v7 and linux/arm64/v8 by default. + - Starting from `1.1.8-8` we're uploading docker images also to ghcr.io/deniszh repository. # Docker Image for Graphite & Statsd @@ -316,7 +316,7 @@ Use `GOCARBON=1` environment variable to enable [go-carbon](https://github.com/l ### brubeck -Use `BRUBECK=1` environment variable to enable [brubeck]() instance of normal Statsd. Please note that brubeck has different config format and not fully compatible with original statsd. +Use `BRUBECK=1` environment variable to enable [brubeck](https://github.com/lukepalmer/brubeck) instance of normal Statsd. Please note that brubeck has different config format and not fully compatible with original statsd. ## Additional Reading diff --git a/build.sh b/build.sh index e56933e..6ab3211 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERSION=1.1.8-7 +VERSION=1.1.8-8 docker build . \ --build-arg python_extra_flags="--single-version-externally-managed --root=/" \ - --no-cache --tag graphiteapp/graphite-statsd:$VERSION \ No newline at end of file + --no-cache --tag graphiteapp/graphite-statsd:$VERSION --progress tty \ No newline at end of file