Skip to content

Commit 4a51806

Browse files
authored
Merge pull request #221 from deniszh/deniszh/1.1.10-5
v1.1.10-5 (Django 3.2, go-carbon 0.17.1, statsd 0.10.1)
2 parents bd43362 + 802a821 commit 4a51806

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ RUN true \
7070
&& echo 'INPUT ( libldap.so )' > /usr/lib/libldap_r.so \
7171
&& pip install \
7272
cairocffi==1.1.0 \
73-
django==2.2.28 \
73+
django==3.2.20 \
7474
django-tagging==0.4.3 \
7575
django-statsd-mozilla \
7676
fadvise \
@@ -83,7 +83,7 @@ RUN true \
8383
python-ldap \
8484
mysqlclient \
8585
psycopg2==2.8.6 \
86-
django-cockroachdb==2.2.*
86+
django-cockroachdb==3.2.*
8787

8888
ARG version=1.1.10
8989

@@ -114,7 +114,7 @@ RUN . /opt/graphite/bin/activate \
114114
&& python3 ./setup.py install $python_extra_flags
115115

116116
# install statsd
117-
ARG statsd_version=0.9.0
117+
ARG statsd_version=0.10.1
118118
ARG statsd_repo=https://github.com/statsd/statsd.git
119119
WORKDIR /opt
120120
RUN git clone "${statsd_repo}" \
@@ -124,7 +124,7 @@ RUN git clone "${statsd_repo}" \
124124

125125
# build go-carbon (optional)
126126
# https://github.com/go-graphite/go-carbon/pull/340
127-
ARG gocarbon_version=0.16.2
127+
ARG gocarbon_version=0.17.1
128128
ARG gocarbon_repo=https://github.com/go-graphite/go-carbon.git
129129
RUN git clone "${gocarbon_repo}" /usr/local/src/go-carbon \
130130
&& cd /usr/local/src/go-carbon \

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
VERSION=1.1.10-4
2+
VERSION=1.1.10-5
33
docker build . \
44
--build-arg python_extra_flags="--single-version-externally-managed --root=/" \
55
--no-cache --tag graphiteapp/graphite-statsd:$VERSION --progress tty

0 commit comments

Comments
 (0)