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.

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

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

Merged
merged 1 commit into from
Aug 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .drone/drone.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
}
Expand Down
12 changes: 6 additions & 6 deletions .drone/drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down