Skip to content

Commit

Permalink
chore: formatting
Browse files Browse the repository at this point in the history
Signed-off-by: Leonardo Di Donato <leodidonato@gmail.com>
  • Loading branch information
leodido committed Aug 31, 2019
1 parent fdb48c8 commit cf422b4
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ 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_INIT ?= quay.io/iovisor/kubectl-trace-init
IMAGE_NAME ?= quay.io/iovisor/kubectl-trace-bpftrace
IMAGE_NAME_INIT ?= quay.io/iovisor/kubectl-trace-init
IMAGE_NAME ?= quay.io/iovisor/kubectl-trace-bpftrace

IMAGE_TRACERUNNER_BRANCH := $(IMAGE_NAME):$(GIT_BRANCH_CLEAN)
IMAGE_TRACERUNNER_COMMIT := $(IMAGE_NAME):$(GIT_COMMIT)
IMAGE_TRACERUNNER_BRANCH := $(IMAGE_NAME):$(GIT_BRANCH_CLEAN)
IMAGE_TRACERUNNER_COMMIT := $(IMAGE_NAME):$(GIT_COMMIT)

IMAGE_INITCONTAINER_BRANCH := $(IMAGE_NAME_INIT):$(GIT_BRANCH_CLEAN)
IMAGE_INITCONTAINER_COMMIT := $(IMAGE_NAME_INIT):$(GIT_COMMIT)
Expand Down
14 changes: 7 additions & 7 deletions build/Dockerfile.initcontainer
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM alpine:3.8
RUN apk add --update \
bash \
bc \
build-base \
curl \
libelf-dev \
linux-headers \
make
bash \
bc \
build-base \
curl \
libelf-dev \
linux-headers \
make

WORKDIR /

Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile.tracerunner
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN make _output/bin/trace-runner
FROM ubuntu:19.10
ARG bpftraceversion=0.9.2-1
RUN apt-get update && apt-get install -y bpftrace=${bpftraceversion} && \
rm -rf /var/lib/apt/lists/* && apt-get clean
rm -rf /var/lib/apt/lists/* && apt-get clean

COPY --from=gobuilder /go/src/github.com/iovisor/kubectl-trace/_output/bin/trace-runner /bin/trace-runner

Expand Down
4 changes: 2 additions & 2 deletions hack/ci-build-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ if [[ ! -z "$TRAVIS_PULL_REQUEST_BRANCH" ]]; then
makeopts="-e GIT_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH"
fi

$make $makeopts image/build
$make $makeopts image/build-init
$make "$makeopts" image/build
$make "$makeopts" image/build-init
4 changes: 2 additions & 2 deletions hack/ci-release-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ fi

if [[ ! -z "$QUAY_TOKEN" ]]; then
$docker login -u="iovisor+kubectltracetravisci" -p="$QUAY_TOKEN" quay.io
$make $makeopts image/push
$make "$makeopts" image/push
fi

if [[ "$TRAVIS_BRANCH" = "master" && "$TRAVIS_PULL_REQUEST_BRANCH" = "" ]]; then
$make $makeopts image/latest
$make "$makeopts" image/latest
fi

0 comments on commit cf422b4

Please # to comment.