Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Using iovisor images #65

Merged
merged 2 commits into from
Mar 9, 2019
Merged

Using iovisor images #65

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
3574f4d
fix: use iovisor images
leodido Mar 8, 2019
58953e7
build: iovisor images
leodido Mar 8, 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
10 changes: 7 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ GIT_COMMIT := $(if $(shell git status --porcelain --untracked-files=no),${COMMIT
GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g")

IMAGE_NAME ?= quay.io/fntlnz/kubectl-trace-bpftrace
IMAGE_NAME_BASE ?= quay.io/fntlnz/kubectl-trace-bpftrace-base
IMAGE_NAME ?= quay.io/iovisor/kubectl-trace-bpftrace
IMAGE_NAME_BASE ?= quay.io/iovisor/kubectl-trace-bpftrace-base

IMAGE_NAME_INIT ?= quay.io/fntlnz/kubectl-trace-init
IMAGE_NAME_INIT ?= quay.io/iovisor/kubectl-trace-init

IMAGE_TRACERUNNER_BRANCH := $(IMAGE_NAME):$(GIT_BRANCH_CLEAN)
IMAGE_TRACERUNNER_COMMIT := $(IMAGE_NAME):$(GIT_COMMIT)
Expand Down Expand Up @@ -59,11 +59,15 @@ image/build:
image/push:
$(DOCKER) push $(IMAGE_TRACERUNNER_BRANCH)
$(DOCKER) push $(IMAGE_TRACERUNNER_COMMIT)
$(DOCKER) push $(IMAGE_INITCONTAINER_BRANCH)
$(DOCKER) push $(IMAGE_INITCONTAINER_COMMIT)

.PHONY: image/latest
image/latest:
$(DOCKER) tag $(IMAGE_TRACERUNNER_COMMIT) $(IMAGE_TRACERUNNER_LATEST)
$(DOCKER) push $(IMAGE_TRACERUNNER_LATEST)
$(DOCKER) tag $(IMAGE_INITCONTAINER_COMMIT) $(IMAGE_INITCONTAINER_LATEST)
$(DOCKER) push $(IMAGE_INITCONTAINER_LATEST)

.PHONY: test
test:
Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (

var (
// ImageNameTag represents the default tracerunner image
ImageNameTag = "quay.io/fntlnz/kubectl-trace-bpftrace:latest"
ImageNameTag = "quay.io/iovisor/kubectl-trace-bpftrace:latest"
// InitImageNameTag represents the default init container image
InitImageNameTag = "quay.io/fntlnz/kubectl-trace-init:latest"
InitImageNameTag = "quay.io/iovisor/kubectl-trace-init:latest"
)

var (
Expand Down