chore(ci/cd): fix grafanasaur credentials and CircleCI image build (#900

) brrrrrrr
grafana · Aug 15, 2019 · b2fe044 · b2fe044
1 parent 45bdebf
commit b2fe044
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/.drone/drone.jsonnet b/.drone/drone.jsonnet
@@ -73,8 +73,8 @@ local manifest(apps) = pipeline('manifest') {
         target: app,
         spec: '.drone/docker-manifest.tmpl',
         ignore_missing: true,
-        username: { from_secret: 'docker_username' },
-        password: { from_secret: 'docker_password' },
+        username: { from_secret: 'saur_username' },
+        password: { from_secret: 'saur_password' },
       },
       depends_on: ['clone'],
     }

diff --git a/.drone/drone.yml b/.drone/drone.yml
@@ -357,35 +357,35 @@ steps:
   settings:
     ignore_missing: true
     password:
-      from_secret: docker_password
+      from_secret: saur_password
     spec: .drone/docker-manifest.tmpl
     target: promtail
     username:
-      from_secret: docker_username
+      from_secret: saur_username
 - depends_on:
   - clone
   image: plugins/manifest
   name: manifest-loki
   settings:
     ignore_missing: true
     password:
-      from_secret: docker_password
+      from_secret: saur_password
     spec: .drone/docker-manifest.tmpl
     target: loki
     username:
-      from_secret: docker_username
+      from_secret: saur_username
 - depends_on:
   - clone
   image: plugins/manifest
   name: manifest-loki-canary
   settings:
     ignore_missing: true
     password:
-      from_secret: docker_password
+      from_secret: saur_password
     spec: .drone/docker-manifest.tmpl
     target: loki-canary
     username:
-      from_secret: docker_username
+      from_secret: saur_username
 trigger:
   ref:
     include:

diff --git a/Makefile b/Makefile
@@ -402,7 +402,7 @@ promtail-debug-image: OCI_PLATFORMS=
 promtail-debug-image:
 	$(SUDO) $(BUILD_OCI) -t $(IMAGE_PREFIX)/promtail:$(IMAGE_TAG)-debug -f cmd/promtail/Dockerfile.debug .
 
-promtail-push: promtail-image
+promtail-push: promtail-image-cross
 	$(call push-image,promtail)
 
 # loki
@@ -415,15 +415,15 @@ loki-debug-image: OCI_PLATFORMS=
 loki-debug-image:
 	$(SUDO) $(BUILD_OCI) -t $(IMAGE_PREFIX)/loki:$(IMAGE_TAG)-debug -f cmd/loki/Dockerfile.debug .
 
-loki-push: loki-image
+loki-push: loki-image-cross
 	$(call push-image,loki)
 
 # loki-canary
 loki-canary-image:
 	$(SUDO) docker build -t $(IMAGE_PREFIX)/loki-canary:$(IMAGE_TAG) -f cmd/loki-canary/Dockerfile .
 loki-canary-image-cross:
 	$(SUDO) $(BUILD_OCI) -t $(IMAGE_PREFIX)/loki-canary:$(IMAGE_TAG) -f cmd/loki-canary/Dockerfile.cross .
-loki-canary-push: loki-canary-image
+loki-canary-push: loki-canary-image-cross
 	$(SUDO) $(PUSH_OCI) $(IMAGE_PREFIX)/loki-canary:$(IMAGE_TAG)
 
 # build-image (only amd64)