Skip to content

Commit

Permalink
Merge pull request #65 from iovisor/feat/iovisor-imgs
Browse files Browse the repository at this point in the history
Using iovisor images
  • Loading branch information
fntlnz authored Mar 9, 2019
2 parents 12b88dd + 58953e7 commit 0510804
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
10 changes: 7 additions & 3 deletions Makefile
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
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

0 comments on commit 0510804

Please sign in to comment.