Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix docker plugin ci #664

Merged
merged 2 commits into from
Jun 13, 2019
Merged

fix docker plugin ci #664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0717b0
fix docker plugin ci
cyriltovena Jun 13, 2019
711c2d2
use binary cache
cyriltovena Jun 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@ jobs:
paths:
- images/

- save_cache:
key: v1-loki-plugin-{{ .Branch }}-{{ .Revision }}
paths:
- cmd/docker-driver/docker-driver

publish:
<<: *defaults
steps:
Expand All @@ -116,6 +121,8 @@ jobs:

- restore_cache:
key: v1-loki-{{ .Branch }}-{{ .Revision }}
- restore_cache:
key: v1-loki-plugin-{{ .Branch }}-{{ .Revision }}

- run:
name: Load Images
Expand All @@ -136,7 +143,7 @@ jobs:
command: |
if [ -n "$DOCKER_USER" ]; then
docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" &&
make push-plugin
make BUILD_IN_CONTAINER=false push-plugin
fi
publish-master:
Expand All @@ -147,7 +154,9 @@ jobs:

- restore_cache:
key: v1-loki-{{ .Branch }}-{{ .Revision }}

- restore_cache:
key: v1-loki-plugin-{{ .Branch }}-{{ .Revision }}

- run:
name: Load Images
command: |
Expand All @@ -165,7 +174,7 @@ jobs:
command: |
if [ -n "$DOCKER_USER" ]; then
docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" &&
PLUGIN_TAG=master make push-plugin && PLUGIN_TAG=latest make push-plugin
PLUGIN_TAG=master make BUILD_IN_CONTAINER=false push-plugin && PLUGIN_TAG=latest make BUILD_IN_CONTAINER=false push-plugin
fi
test-helm:
Expand Down
4 changes: 2 additions & 2 deletions pkg/promtail/server/ui/assets_vfsdata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,9 +451,9 @@ var Assets = func() http.FileSystem {
"/templates/_base.html": &vfsgen۰CompressedFileInfo{
name: "_base.html",
modTime: time.Date(1970, 1, 1, 0, 0, 1, 0, time.UTC),
uncompressedSize: 2784,
uncompressedSize: 2758,

compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xbc\x56\x61\x6f\xdb\x36\x10\xfd\x9e\x5f\xc1\x72\x03\x9a\x00\xa3\x88\x22\xfd\x30\xac\x92\x86\xad\xc9\xd0\x00\xc3\x1a\xb4\x5e\xb1\x61\x18\x82\x93\x44\x49\x4c\x28\x92\x25\x4f\x5a\x0c\xc3\xff\x7d\xa0\xe9\xc4\x96\x6c\xb5\x5d\xb1\xd6\x5f\x2c\x1e\x79\xf7\x1e\xef\x9e\x1e\x94\x3e\xb9\x78\xfd\x72\xf1\xe7\xf5\x25\x69\xb1\x53\xf9\x49\x1a\xfe\x88\x02\xdd\x64\x54\x68\x9a\x9f\x10\x42\x48\xda\x0a\xa8\xe2\xe3\x66\xd9\x09\x04\xd2\x22\x5a\x26\xde\xf7\x72\xc8\xe8\x4b\xa3\x51\x68\x64\x8b\xa5\x15\x94\x94\x71\x95\x51\x14\xf7\xc8\x43\xc1\x17\xa4\x6c\xc1\x79\x81\x59\x8f\x35\xfb\x9e\x4e\x6b\x69\xe8\x44\x46\x9d\x29\x0c\xfa\xbd\x7c\x6d\xa4\xae\xc4\xfd\x77\xda\xd4\x46\x29\xf3\xcf\x7e\x1e\x4a\x54\x22\x5f\xad\x88\x85\x46\x2c\xc2\x82\xac\xd7\x29\x8f\xe1\xdd\x31\x25\xf5\x1d\x71\x42\x65\xd4\xb7\xc6\x61\xd9\x23\x91\xa5\xd1\x94\xb4\x4e\xd4\x19\xdd\xe4\x63\x7b\xed\x44\x2d\xef\xc9\x7a\xcd\x3d\x02\xca\x92\xcb\xae\xe1\x35\x0c\xe1\x68\x22\x4b\xf3\xe3\x90\xad\x56\xa4\xe8\xa5\xaa\xde\x09\xe7\xa5\xd1\x64\xbd\xde\x67\xe3\x4b\x27\x2d\x12\xef\xca\xf9\x9a\x83\xd0\x95\x71\xfc\xd6\xf3\xdb\xf7\xbd\x70\x4b\x76\x9e\x9c\x27\xcf\x92\x4e\xea\xe4\xd6\xcf\x20\xa4\x3c\x56\xce\x03\xca\xe7\xc2\x59\x63\xad\x70\x9f\x08\xf4\x59\x20\x85\x31\xe8\xd1\x81\x65\xcf\x93\x67\xc9\x79\x00\x7d\x0c\x7d\x2a\xee\x64\x66\xb8\xb4\x62\xab\xa0\xd2\x7b\xba\x9d\x21\x2e\x95\xf0\xad\x10\xf8\xb1\x01\xce\x10\x2b\xfd\x94\x59\xe9\xe7\xa8\xfd\xbf\x84\x02\xb2\x75\xa6\x43\x90\xea\xab\x81\x4e\xbb\xf0\x9c\x35\x6a\x69\xdb\x20\x6b\x3f\xee\xc5\xde\xc6\xc7\xda\x32\x55\xc8\x8e\x73\xf8\x0d\xe0\xc8\xf5\x4f\x8b\x57\x37\xd7\x6f\x2e\x7f\xb9\xfa\x83\x64\xe4\x80\x1d\x7d\x71\x90\xf1\xf3\xef\x57\xbf\x5e\xdc\xbc\xbb\x7c\xf3\xf6\xea\xf5\x6f\xdb\x9c\x29\xf2\x38\xeb\xdb\xd3\xba\xd7\x25\x86\xbd\xd3\x33\xb2\x1a\xed\xc5\xfd\xa7\x7f\x55\x80\xc0\xd0\x34\x8d\x0a\x4d\x34\x46\xa1\xb4\xf4\xef\xa7\x67\xc9\xf6\xf9\xf4\x6c\x94\xb6\xde\x2d\x8f\xc8\x72\xb5\x42\xd1\x59\x05\x28\x08\x0d\x7e\x48\x49\xb2\x5e\x47\x7b\xe4\xd1\x1f\xe3\xa2\x30\xd5\x72\x6f\x8c\x1a\x06\x52\x2a\xf0\x3e\xa3\x1a\x86\x02\x1c\xa9\xe5\xbd\xa8\x18\x1a\x4b\x62\x80\x89\x7b\x0b\xba\x62\xbe\x7b\x08\x54\xe0\xee\x48\xd1\x6c\xfe\xe9\xb8\xbd\x69\x25\x1f\xeb\x05\x9f\x04\xa9\x85\x63\xb5\xea\x65\x45\xf3\x78\xe4\xe4\xa0\x17\x69\xd1\x23\x1a\xbd\x55\x53\x5c\xd0\x31\xab\x6d\x9b\x1c\x25\xa3\xa6\x95\x46\x29\xb0\x5e\x3c\x84\xc1\x35\x02\x33\xfa\x8d\x86\x81\x6d\x6d\x9a\x12\x70\x12\xb6\x97\x10\x55\x46\x6b\x50\x21\x61\x13\x0d\x67\x9c\x51\x11\x66\x92\xa1\xa0\x08\x6a\x5e\x6c\xa0\xc2\xd5\x65\x03\x61\x9e\x93\x1b\xef\xd4\x66\x41\x1f\x27\xcd\x36\x96\x1e\xbc\xc4\x82\x9e\xc9\x7e\xc2\xd8\x7e\x01\xef\x98\xd1\x6a\x49\xf3\x03\xf8\x0f\x55\x39\xe0\x11\x80\x59\x01\xee\xc3\xe0\x5f\x2a\x8d\xb1\xc3\xc4\x94\xc7\xf9\xe6\x47\x64\x00\x93\xf6\x15\x0e\x74\x35\xeb\x21\x34\xbf\xde\xfa\x55\xca\x21\x3f\x39\x52\x2f\x68\x51\x56\x93\xd9\x8e\x21\x1e\x04\x44\x1e\x95\x34\x33\x9f\x5e\x4d\x32\x35\x0c\x33\x67\x49\xb4\xc7\xbd\xf3\x4c\xa2\xe8\x68\x3e\xba\x20\x0b\x06\x3a\x6f\x90\xc2\x0d\xb2\x14\xac\x92\xbe\x34\x83\x70\x4b\x9a\xbf\x8d\x21\x72\xf1\x10\x0a\xd7\x4e\xb9\x92\x5f\x8e\x45\x7c\x9f\x3c\xcd\x17\xf1\xe1\xbf\x20\x92\x1d\x24\x99\x3f\xbf\x3f\x77\x72\xc8\x28\x7c\xc4\xf9\x1f\x38\x6f\x24\xb6\x7d\x91\x94\xa6\xe3\x8d\x83\x1a\x34\x70\x65\xee\x24\x25\x0f\x6f\xfc\x4d\xa1\x40\xdf\xd1\xfc\x95\x50\x76\x23\x87\x59\xb0\x59\xfa\x29\xef\xd5\x31\xbd\x56\x72\x98\x78\xdc\x38\x94\x72\x0d\xc3\x8c\x11\x3f\xaa\x6e\xe7\xc5\xd1\x7f\x53\x1e\xbf\x67\xff\x0d\x00\x00\xff\xff\xfa\x23\x75\xb9\xe0\x0a\x00\x00"),
compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xbc\x56\xef\x8b\xdc\x36\x10\xfd\x7e\x7f\x85\xa2\x14\x72\x07\x95\x45\xb8\x7c\x28\x8d\xed\xd2\xe6\xae\xe4\xa0\x34\x4b\xb2\x0d\x2d\xa5\x1c\x63\x5b\xb6\x75\x27\x4b\x8a\x34\x76\x77\x59\xf6\x7f\x2f\x5a\xef\x2f\x7b\xd7\x49\x5b\x7a\xdd\x2f\x6b\x8d\x34\xf3\x9e\x66\x9e\x1f\x8e\x9f\xdd\xbc\x7b\x33\xff\x6d\x76\x4b\x6a\x6c\x54\x7a\x11\x87\x3f\xa2\x40\x57\x09\x15\x9a\xa6\x17\x84\x10\x12\xd7\x02\x8a\xfe\x71\xb3\x6c\x04\x02\xa9\x11\x2d\x13\x9f\x5a\xd9\x25\xf4\x8d\xd1\x28\x34\xb2\xf9\xd2\x0a\x4a\xf2\x7e\x95\x50\x14\x0b\xe4\xa1\xe0\x6b\x92\xd7\xe0\xbc\xc0\xa4\xc5\x92\x7d\x43\xc7\xb5\x34\x34\x22\xa1\xce\x64\x06\xfd\x51\xbe\x36\x52\x17\x62\xf1\xb5\x36\xa5\x51\xca\xfc\x79\x9c\x87\x12\x95\x48\x57\x2b\x62\xa1\x12\xf3\xb0\x20\xeb\x75\xcc\xfb\xf0\xe1\x98\x92\xfa\x91\x38\xa1\x12\xea\x6b\xe3\x30\x6f\x91\xc8\xdc\x68\x4a\x6a\x27\xca\x84\x6e\xf2\xb1\x9e\x39\x51\xca\x05\x59\xaf\xb9\x47\x40\x99\x73\xd9\x54\xbc\x84\x2e\x1c\x8d\x64\x6e\xbe\xeb\x92\xd5\x8a\x64\xad\x54\xc5\x47\xe1\xbc\x34\x9a\xac\xd7\xc7\x6c\x7c\xee\xa4\x45\xe2\x5d\x3e\x5d\xb3\x13\xba\x30\x8e\x3f\x78\xfe\xf0\xa9\x15\x6e\xc9\xae\xa3\xeb\xe8\x65\xd4\x48\x1d\x3d\xf8\x09\x84\x98\xf7\x95\xff\x35\x94\x35\xd6\x0a\xf7\x94\x20\x99\x31\xe8\xd1\x81\x65\xaf\xa2\x97\xd1\x75\x00\xdd\x87\xfe\x2e\xee\x68\x5e\xb8\xb4\x62\xab\x9e\xdc\x7b\xba\x9d\x1f\x2e\x95\xf0\xb5\x10\xf8\xa5\xe1\x4d\x10\xcb\xfd\x98\x59\xee\xa7\xa8\xfd\xb7\x84\x02\xb2\x75\xa6\x41\x90\xea\x7f\x03\x1d\x77\xe1\x15\xab\xd4\xd2\xd6\x41\xd2\x7e\xd8\x8b\xa3\x8d\x2f\xb5\x65\xac\x90\x03\xe7\xf0\xeb\xc0\x91\xd9\xf7\xf3\xb7\xf7\xb3\xf7\xb7\x3f\xde\xfd\x4a\x12\x72\xc2\x8e\xbe\x3e\xc9\xf8\xe1\x97\xbb\x9f\x6e\xee\x3f\xde\xbe\xff\x70\xf7\xee\xe7\x6d\xce\x18\x79\x98\xf5\xd5\x65\xd9\xea\x1c\xc3\xde\xe5\x15\x59\x0d\xf6\xfa\xfd\x17\xbf\x17\x80\xc0\xd0\x54\x95\x0a\x4d\x34\x46\xa1\xb4\xf4\x8f\x17\x57\xd1\xf6\xf9\xf2\x6a\x90\xb6\x3e\x2c\xcf\xc8\x72\xb5\x42\xd1\x58\x05\x28\x08\x0d\x5e\x48\x49\xb4\x5e\xf7\xd6\xc8\x7b\x6f\xec\x17\x99\x29\x96\x47\x63\xd4\xd0\x91\x5c\x81\xf7\x09\xd5\xd0\x65\xe0\x48\x29\x17\xa2\x60\x68\x2c\xe9\x03\x4c\x2c\x2c\xe8\x82\xf9\x66\x17\x28\xc0\x3d\x92\xac\xda\xfc\xd3\x61\x7b\xe3\x42\xee\xeb\x05\x8f\x04\xa9\x85\x63\xa5\x6a\x65\x71\x3c\x9a\xfd\xf1\xac\x45\x34\x7a\xab\xa3\x7e\x41\x87\x7c\xb6\x0d\x72\x94\x0c\xda\x95\x1b\xa5\xc0\x7a\xb1\x0b\x83\xab\x04\x26\xf4\xb9\x86\x8e\x6d\xcd\x99\x12\x70\x12\xb6\xf4\x45\x91\xd0\x12\x54\x48\xd8\x44\xc3\x19\x67\x54\x0f\x33\xca\x50\x90\x05\x1d\xcf\x37\x50\xe1\xd2\xb2\x82\x30\xc9\xd1\x5d\x0f\x3a\xb3\xa0\xcf\x93\x66\x1b\x23\x0f\x2e\x62\x41\x4f\x64\x3f\x63\xec\xb8\x80\x77\xcc\x68\xb5\xa4\xe9\x09\xfc\xe7\xaa\x9c\xf0\x08\xc0\x2c\x03\xf7\x79\xf0\xa7\x4a\x63\xec\x34\x31\xe6\xfd\x7c\xcf\xc9\x00\x46\xed\xcb\x1c\xe8\x62\xe7\x1e\xcf\x69\x3a\xdb\x3a\x53\xcc\x21\xbd\x38\x93\x1f\x54\x27\x8b\xd1\x2c\x87\x25\x77\x82\x21\x7b\xe5\x4c\xcc\xa3\x55\xa3\x4c\x0d\xdd\xc4\x59\xd2\x1b\xe1\xd1\x79\x26\x51\x34\x34\x1d\x5c\x88\x05\xab\x9c\xb6\x42\xe1\x3a\x99\x0b\x56\x48\x9f\x9b\x4e\xb8\x25\x4d\x3f\xf4\x21\x72\xb3\x0b\x85\x6b\xc7\x5c\xc9\xa7\x63\xd1\xbf\x3f\x9e\xa6\xf3\xfe\xe1\x9f\x20\x92\x03\x24\x99\x3e\x7f\x3c\x67\x72\xca\x28\x7c\xaa\xf9\x6f\x39\xaf\x24\xd6\x6d\x16\xe5\xa6\xe1\x95\x83\x12\x34\x70\x65\x1e\x25\x25\xbb\x37\xfc\x3e\x53\xa0\x1f\x69\xfa\x56\x28\xbb\x91\xc3\x24\xd8\x24\xfd\x98\xb7\xea\x9c\x3e\x0b\xd9\x8d\xdc\x6c\x18\x8a\xb9\x86\x6e\xc2\x72\xf7\xaa\x3b\xb8\x6e\xef\xb4\x31\xef\xbf\x5a\xff\x0a\x00\x00\xff\xff\x77\xf3\x53\x19\xc6\x0a\x00\x00"),
},
"/templates/service-discovery.html": &vfsgen۰CompressedFileInfo{
name: "service-discovery.html",
Expand Down