Fixing statsd building

graphite-project · Feb 22, 2019 · 8a3d18b · 8a3d18b
1 parent 8706be1
commit 8a3d18b
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -85,11 +85,10 @@ RUN . /opt/graphite/bin/activate \
 # install statsd (as we have to use this ugly way)
 ARG statsd_version=8d5363cb109cc6363661a1d5813e0b96787c4411
 ARG statsd_repo=https://github.com/etsy/statsd.git
-RUN git init /opt/statsd \
- && git -C /opt/statsd remote add origin "${statsd_repo}" \
- && git -C /opt/statsd fetch origin "${statsd_version}" \
- && git -C /opt/statsd checkout "${statsd_version}" \
+WORKDIR /opt
+RUN git clone "${statsd_repo}" \
  && cd /opt/statsd \
+ && git checkout "${statsd_version}" \
  && npm install
 
 COPY conf/opt/graphite/conf/                             /opt/defaultconf/graphite/

diff --git a/conf/etc/service/carbon-aggregator/log/run b/conf/etc/service/carbon-aggregator/log/run
diff --git a/conf/etc/service/carbon-relay/log/run b/conf/etc/service/carbon-relay/log/run
diff --git a/conf/etc/service/carbon/log/run b/conf/etc/service/carbon/log/run
diff --git a/conf/etc/service/statsd/log/run b/conf/etc/service/statsd/log/run