Skip to content

Commit cf422b4

Browse files
committed
chore: formatting
Signed-off-by: Leonardo Di Donato <[email protected]>
1 parent fdb48c8 commit cf422b4

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ GIT_COMMIT := $(if $(shell git status --porcelain --untracked-files=no),${COMMIT
88
GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
99
GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g")
1010

11-
IMAGE_NAME_INIT ?= quay.io/iovisor/kubectl-trace-init
12-
IMAGE_NAME ?= quay.io/iovisor/kubectl-trace-bpftrace
11+
IMAGE_NAME_INIT ?= quay.io/iovisor/kubectl-trace-init
12+
IMAGE_NAME ?= quay.io/iovisor/kubectl-trace-bpftrace
1313

14-
IMAGE_TRACERUNNER_BRANCH := $(IMAGE_NAME):$(GIT_BRANCH_CLEAN)
15-
IMAGE_TRACERUNNER_COMMIT := $(IMAGE_NAME):$(GIT_COMMIT)
14+
IMAGE_TRACERUNNER_BRANCH := $(IMAGE_NAME):$(GIT_BRANCH_CLEAN)
15+
IMAGE_TRACERUNNER_COMMIT := $(IMAGE_NAME):$(GIT_COMMIT)
1616

1717
IMAGE_INITCONTAINER_BRANCH := $(IMAGE_NAME_INIT):$(GIT_BRANCH_CLEAN)
1818
IMAGE_INITCONTAINER_COMMIT := $(IMAGE_NAME_INIT):$(GIT_COMMIT)

build/Dockerfile.initcontainer

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
FROM alpine:3.8
22
RUN apk add --update \
3-
bash \
4-
bc \
5-
build-base \
6-
curl \
7-
libelf-dev \
8-
linux-headers \
9-
make
3+
bash \
4+
bc \
5+
build-base \
6+
curl \
7+
libelf-dev \
8+
linux-headers \
9+
make
1010

1111
WORKDIR /
1212

build/Dockerfile.tracerunner

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN make _output/bin/trace-runner
1111
FROM ubuntu:19.10
1212
ARG bpftraceversion=0.9.2-1
1313
RUN apt-get update && apt-get install -y bpftrace=${bpftraceversion} && \
14-
rm -rf /var/lib/apt/lists/* && apt-get clean
14+
rm -rf /var/lib/apt/lists/* && apt-get clean
1515

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

hack/ci-build-image.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ if [[ ! -z "$TRAVIS_PULL_REQUEST_BRANCH" ]]; then
88
makeopts="-e GIT_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH"
99
fi
1010

11-
$make $makeopts image/build
12-
$make $makeopts image/build-init
11+
$make "$makeopts" image/build
12+
$make "$makeopts" image/build-init

hack/ci-release-image.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ fi
1414

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

2020
if [[ "$TRAVIS_BRANCH" = "master" && "$TRAVIS_PULL_REQUEST_BRANCH" = "" ]]; then
21-
$make $makeopts image/latest
21+
$make "$makeopts" image/latest
2222
fi

0 commit comments

Comments
 (0)