Skip to content

Commit

Permalink
Merge pull request #221 from deniszh/deniszh/1.1.10-5
Browse files Browse the repository at this point in the history
v1.1.10-5 (Django 3.2, go-carbon 0.17.1, statsd 0.10.1)
  • Loading branch information
deniszh authored Jul 9, 2023
2 parents bd43362 + 802a821 commit 4a51806
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ RUN true \
&& echo 'INPUT ( libldap.so )' > /usr/lib/libldap_r.so \
&& pip install \
cairocffi==1.1.0 \
django==2.2.28 \
django==3.2.20 \
django-tagging==0.4.3 \
django-statsd-mozilla \
fadvise \
Expand All @@ -83,7 +83,7 @@ RUN true \
python-ldap \
mysqlclient \
psycopg2==2.8.6 \
django-cockroachdb==2.2.*
django-cockroachdb==3.2.*

ARG version=1.1.10

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

# install statsd
ARG statsd_version=0.9.0
ARG statsd_version=0.10.1
ARG statsd_repo=https://github.com/statsd/statsd.git
WORKDIR /opt
RUN git clone "${statsd_repo}" \
Expand All @@ -124,7 +124,7 @@ RUN git clone "${statsd_repo}" \

# build go-carbon (optional)
# https://github.com/go-graphite/go-carbon/pull/340
ARG gocarbon_version=0.16.2
ARG gocarbon_version=0.17.1
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 \
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
VERSION=1.1.10-4
VERSION=1.1.10-5
docker build . \
--build-arg python_extra_flags="--single-version-externally-managed --root=/" \
--no-cache --tag graphiteapp/graphite-statsd:$VERSION --progress tty

0 comments on commit 4a51806

Please sign in to comment.