From 2d6927b1cf7470c79d96d8480965c64b41244bc6 Mon Sep 17 00:00:00 2001
From: flucrezia <f.lucrezia@tiesse.com>
Date: Wed, 20 Jul 2022 11:46:29 +0200
Subject: [PATCH] Docker build from local copy, expands /var/lib/graphite/
 paths in Dockerfile

---
 .dockerignore | 2 ++
 Dockerfile    | 7 ++-----
 2 files changed, 4 insertions(+), 5 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..a43842cd4
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+doc
+*.md
diff --git a/Dockerfile b/Dockerfile
index 9d4a507cf..c9af1387a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,15 @@
 FROM golang:1.17.4-alpine3.15 AS build
 
-ARG gocarbon_version=0.16.2
-ARG gocarbon_repo=https://github.com/go-graphite/go-carbon.git
+COPY . /usr/local/src/go-carbon
 RUN apk add --update git make bash \
- && git clone "${gocarbon_repo}" /usr/local/src/go-carbon \
  && cd /usr/local/src/go-carbon \
- && git checkout tags/v"${gocarbon_version}" \
  && make go-carbon \
  && chmod +x go-carbon && cp -fv go-carbon /tmp
 
 FROM alpine:3.15
 
 RUN addgroup -S carbon && adduser -S carbon -G carbon \
-    && mkdir -p /var/lib/graphite/{whisper,dump,tagging} /var/log/go-carbon /etc/go-carbon/ \
+    && mkdir -p /var/lib/graphite/whisper /var/lib/graphite/dump /var/lib/graphite/tagging /var/log/go-carbon /etc/go-carbon/ \
     && chown -R carbon:carbon /var/lib/graphite/ /var/log/go-carbon
 
 COPY --from=build /tmp/go-carbon /usr/sbin/go-carbon