[Loki]: Cleanup dockerfile #1949

SerialVelocity · 2020-04-16T10:32:41Z

What this PR does / why we need it:

It reduces the amount of layers in the docker file. Installing libcap in an earlier layer and then deleting it in a later layer doesn't remove the earlier data
It changes the user/group ID to match what the default is in the Helm chart currently
It changes the data directory to match what the default is in the Helm chart currently
Adds an nsswitch.conf to stop localhost DNS lookups
Updates Dockerfile.cross to match the plain Dockerfile except setep as I'm not sure the amd64 binary will work on cross-compiled binaries

Which issue(s) this PR fixes:
Fixes #1928

Special notes for your reviewer:
The PRs that changed the user/group ID and data directory haven't made it into a release yet so this should be safe to change.

I couldn't test this as GolangCI shutdown yesterday.

Checklist

Documentation added
Tests updated

…figuration

setep is probably not needed anymore due to 3100 being the default port. Also, I'm not sure the amd64 binary works on other arch binaries.

CLAassistant · 2020-04-16T10:32:46Z

All committers have signed the CLA.

codecov-io · 2020-04-16T10:40:39Z

Codecov Report

Merging #1949 into master will decrease coverage by 0.08%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #1949      +/-   ##
==========================================
- Coverage   64.75%   64.67%   -0.09%     
==========================================
  Files         125      125              
  Lines        9539     9539              
==========================================
- Hits         6177     6169       -8     
- Misses       2929     2942      +13     
+ Partials      433      428       -5

Impacted Files	Coverage Δ
pkg/promtail/positions/positions.go	`47.32% <0.00%> (-13.40%)`	⬇️
pkg/promtail/targets/filetarget.go	`70.12% <0.00%> (+1.82%)`	⬆️
pkg/promtail/targets/tailer.go	`78.40% <0.00%> (+4.54%)`	⬆️

cyriltovena · 2020-04-17T13:24:33Z

cmd/loki/loki-local-config.yaml

@@ -27,10 +27,10 @@ schema_config:

 storage_config:
  boltdb:
-    directory: /loki/index
+    directory: /data/loki/index


@slim-bean you mentioned something about this ? I think you're good with that change right ?

this used to be /tmp a long time ago and got changed to /loki

/loki is annoying because many operating systems don't easily let you create this directory

I don't know if /data makes this any easier? my mac is dead at the moment, can you create /data (or does it exist) on mac?

No so it's the same :)

sudo mkdir /data Password: mkdir: /data: Read-only file system

I would be favor of moving this back to /tmp if we were going to change it all

@cyriltovena Did you run that inside the OSX docker hypervisor? By default that directory isn't shared with the host (see https://docs.docker.com/docker-for-mac/#file-sharing)

So do you want the consistency with the helm image or /tmp in this file?

We are talking about running locally on mac, not in docker at all. This is useful for us for testing/debugging etc, just run the processes and use the loki-local-config.yaml.

This broke however when it was changed to /loki some time ago because you can't make this directory on a mac (nor /data)

#1833 changed this apparently, however /loki is also kind of a poor choice, it's both unusable on mac and not linux FHS compliant.

Given the sort of dual use of this file as both the config file for a container and also running outside of containers I'm not sure the best path forward here to be honest

I'm inclined to say just leave it as is for now and we should tackle this in a separate issue.

Ok, I've removed the config file change

owen-d

Hey, this is great research/work -- thanks. I had a few nitpicks, but overall it seems a nice addition. I'll approve and if others feel similarly, please make my proposed caching-related dockerfile changes.

owen-d · 2020-04-17T13:07:42Z

cmd/loki/Dockerfile

@@ -7,20 +7,21 @@ WORKDIR /src/loki
 RUN make clean && (if [ "${TOUCH_PROTOS}" ]; then make touch-protos; fi) && make BUILD_IN_CONTAINER=false loki

 FROM alpine:3.9
-RUN apk add --update --no-cache ca-certificates libcap \


I think there's a tradeoff here of caching vs layer reduction and I'm inclined to think that caching is a bit more preferrable although I'm biased by building this regularly. That being said, I don't think it's a huge deal either way.

sry deleted my last message, didn't read closely enough

I think I'd like to leave this as is, same as the changes below for 2 reasons:

We spent a stupid amount of time trying to test this worked after adding this change and I don't have time to redo this.

I prefer the separate run steps below I think it's easier to read and understand what the steps are doing/for

Could you elaborate on what you spent a lot of time testing? Adding a new package should be as simple as adding an apk add --no-cache <pkgname>.

All the cap stuff was new and we tried several combinations of where to install libcap as well as removing it and where to remove it to keep the resulting image size as small as possible as well as make sure it still works.

owen-d · 2020-04-17T13:21:08Z

cmd/loki/Dockerfile.cross

@@ -13,9 +13,21 @@ WORKDIR /src/loki
 RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make BUILD_IN_CONTAINER=false loki

 FROM alpine:3.9
-RUN apk add --update --no-cache ca-certificates


I think this should remain earlier in the file for caching benefits.

Moved back to the top

owen-d · 2020-04-17T13:21:50Z

cmd/loki/loki-local-config.yaml

@@ -27,10 +27,10 @@ schema_config:

 storage_config:
  boltdb:
-    directory: /loki/index
+    directory: /data/loki/index


nice, thanks for the consistency!

slim-bean · 2020-04-17T14:11:34Z

cmd/loki/Dockerfile

+RUN addgroup -g 10001 -S loki && \
+    adduser -u 10001 -S loki -G loki && \
+    mkdir -p /data && \
+    chown -R loki:loki /etc/loki /data


As mentioned above, would prefer to leave this as is.

Ok, separated out into two steps again

…dir steps

…e the image smaller

SerialVelocity

Ok, I think I dealt with or responded to all the comments.

@owen-d You mentioned you preferred caching over smaller images so I removed the apk del --no-cache libcap that would've been later in the file otherwise. This removes an extra download of the apk repositories. It's not really needed as it won't reduce the size of the image (since it's in a separate RUN step).

SerialVelocity · 2020-04-20T12:12:41Z

cmd/loki/Dockerfile

@@ -7,20 +7,21 @@ WORKDIR /src/loki
 RUN make clean && (if [ "${TOUCH_PROTOS}" ]; then make touch-protos; fi) && make BUILD_IN_CONTAINER=false loki

 FROM alpine:3.9
-RUN apk add --update --no-cache ca-certificates libcap \


Could you elaborate on what you spent a lot of time testing? Adding a new package should be as simple as adding an apk add --no-cache <pkgname>.

SerialVelocity · 2020-04-20T12:12:53Z

cmd/loki/Dockerfile

+RUN addgroup -g 10001 -S loki && \
+    adduser -u 10001 -S loki -G loki && \
+    mkdir -p /data && \
+    chown -R loki:loki /etc/loki /data


Ok, separated out into two steps again

SerialVelocity · 2020-04-20T12:13:08Z

cmd/loki/Dockerfile.cross

@@ -13,9 +13,21 @@ WORKDIR /src/loki
 RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make BUILD_IN_CONTAINER=false loki

 FROM alpine:3.9
-RUN apk add --update --no-cache ca-certificates


Moved back to the top

SerialVelocity · 2020-04-20T12:22:46Z

cmd/loki/loki-local-config.yaml

@@ -27,10 +27,10 @@ schema_config:

 storage_config:
  boltdb:
-    directory: /loki/index
+    directory: /data/loki/index


@cyriltovena Did you run that inside the OSX docker hypervisor? By default that directory isn't shared with the host (see https://docs.docker.com/docker-for-mac/#file-sharing)

So do you want the consistency with the helm image or /tmp in this file?

SerialVelocity added 4 commits April 16, 2020 11:22

Reduce the amount of layers and data in the Dockerfile

67e1c0a

Change the loki user and data directory to match the default helm con…

e71bbd4

…figuration

Add an nsswitch.conf to stop localhost DNS requests

5184e14

Copy changes to Dockerfile.cross except setep

75c6d05

setep is probably not needed anymore due to 3100 being the default port. Also, I'm not sure the amd64 binary works on other arch binaries.

pull-request-size bot added the size/M label Apr 16, 2020

SerialVelocity mentioned this pull request Apr 16, 2020

Loki asking DNS to resolve localhost #1928

Closed

cyriltovena reviewed Apr 17, 2020

View reviewed changes

owen-d approved these changes Apr 17, 2020

View reviewed changes

slim-bean reviewed Apr 17, 2020

View reviewed changes

SerialVelocity added 2 commits April 20, 2020 13:06

Install ca-certificates earlier and split creating user and creating …

775b22f

…dir steps

Install libcap earlier and don't bother deleting it as it doesn't mak…

a92aaf2

…e the image smaller

SerialVelocity commented Apr 20, 2020

View reviewed changes

SerialVelocity added 2 commits April 20, 2020 16:41

Revert config changes

9116d65

Revert the dockerfile changes needed for the config revert

c068028

pull-request-size bot added size/S and removed size/M labels Apr 21, 2020

cyriltovena merged commit 97788ab into grafana:master Apr 23, 2020

Depechie mentioned this pull request Mar 23, 2022

Permission denied on startup of Loki > 2.3.0 with docker volumes in docker-compose #5513

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Loki]: Cleanup dockerfile #1949

[Loki]: Cleanup dockerfile #1949

SerialVelocity commented Apr 16, 2020 •

edited

Loading

CLAassistant commented Apr 16, 2020 •

edited

Loading

codecov-io commented Apr 16, 2020

cyriltovena Apr 17, 2020

slim-bean Apr 17, 2020

cyriltovena Apr 17, 2020

slim-bean Apr 17, 2020

SerialVelocity Apr 20, 2020

slim-bean Apr 20, 2020

SerialVelocity Apr 20, 2020

owen-d left a comment

owen-d Apr 17, 2020

slim-bean Apr 17, 2020

slim-bean Apr 17, 2020

SerialVelocity Apr 20, 2020

slim-bean Apr 20, 2020

owen-d Apr 17, 2020

SerialVelocity Apr 20, 2020

owen-d Apr 17, 2020

slim-bean Apr 17, 2020

SerialVelocity Apr 20, 2020

SerialVelocity left a comment

SerialVelocity Apr 20, 2020

SerialVelocity Apr 20, 2020

SerialVelocity Apr 20, 2020

SerialVelocity Apr 20, 2020

[Loki]: Cleanup dockerfile #1949

[Loki]: Cleanup dockerfile #1949

Conversation

SerialVelocity commented Apr 16, 2020 • edited Loading

CLAassistant commented Apr 16, 2020 • edited Loading

codecov-io commented Apr 16, 2020

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

owen-d left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SerialVelocity left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SerialVelocity commented Apr 16, 2020 •

edited

Loading

CLAassistant commented Apr 16, 2020 •

edited

Loading