Add goyacc to logcli and loki-canary Dockerfiles

grafana · Feb 6, 2022 · 0ee887c · 0ee887c
1 parent 4bb2e79
commit 0ee887c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/cmd/logcli/Dockerfile b/cmd/logcli/Dockerfile
@@ -2,6 +2,18 @@ FROM golang:1.17.2 as build
 
 COPY . /src/loki
 WORKDIR /src/loki
+
+# Copying this from loki-build-image/Dockerfile
+# because these dependencies are required by the Makefile in certain
+# circumstances. This should be removed and the base image above changed
+# from golang to loki-build-image once the latter becomes available for arm.
+RUN GO111MODULE=on go install \
+    # Due to the lack of a proper release tag, we use the commit hash of
+    # https://github.com/golang/tools/releases v0.1.7
+    golang.org/x/tools/cmd/goyacc@58d531046acdc757f177387bc1725bfa79895d69 && \
+    rm -rf /go/pkg /go/src
+ENV GOCACHE=/go/cache
+
 RUN make clean && make BUILD_IN_CONTAINER=false logcli
 
 FROM alpine:3.13

diff --git a/cmd/loki-canary/Dockerfile b/cmd/loki-canary/Dockerfile
@@ -2,6 +2,18 @@ FROM golang:1.17.2 as build
 
 COPY . /src/loki
 WORKDIR /src/loki
+
+# Copying this from loki-build-image/Dockerfile
+# because these dependencies are required by the Makefile in certain
+# circumstances. This should be removed and the base image above changed
+# from golang to loki-build-image once the latter becomes available for arm.
+RUN GO111MODULE=on go install \
+    # Due to the lack of a proper release tag, we use the commit hash of
+    # https://github.com/golang/tools/releases v0.1.7
+    golang.org/x/tools/cmd/goyacc@58d531046acdc757f177387bc1725bfa79895d69 && \
+    rm -rf /go/pkg /go/src
+ENV GOCACHE=/go/cache
+
 RUN make clean && make BUILD_IN_CONTAINER=false loki-canary
 
 FROM alpine:3.13