Skip to content

Commit 8d4239b

Browse files
authored
Merge pull request #8075 from zalando-incubator/linter-warnings
[e2e] minor improvements to build
2 parents 68a05b7 + 27ae127 commit 8d4239b

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

delivery.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pipeline:
2121
commands:
2222
- desc: install deps
2323
cmd: |
24-
apt-get update && apt-get install -y rsync
24+
apt-get update -qq && apt-get install -qq rsync
2525
- desc: build and push
2626
cmd: |
2727
cd ./test/e2e/

test/e2e/Dockerfile

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# builder image
2-
FROM golang:1.22 as builder
2+
FROM golang:1.22 AS builder
33

44
RUN CGO_ENABLED=0 go install github.com/onsi/ginkgo/v2/[email protected]
55

@@ -10,14 +10,9 @@ FROM container-registry.zalando.net/library/python-3.12-slim:latest
1010

1111
ARG TARGETARCH
1212

13-
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
14-
bc \
15-
curl \
16-
git \
17-
jq \
18-
pwgen \
13+
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -qq bc curl git jq pwgen \
1914
&& rm -rf /var/lib/apt/lists/* \
20-
&& pip3 install awscli --no-cache-dir
15+
&& pip3 install awscli --no-cache-dir -q
2116

2217
ARG KUBE_VERSION
2318
ADD https://storage.googleapis.com/kubernetes-release/release/$KUBE_VERSION/bin/linux/$TARGETARCH/kubectl /usr/bin/kubectl
@@ -31,9 +26,9 @@ COPY --from=container-registry.zalando.net/teapot/aws-account-creator:latest /aw
3126

3227
ADD . /workdir
3328

34-
ENV KUBECTL_PATH /usr/bin/kubectl
35-
ENV KUBERNETES_PROVIDER skeleton
36-
ENV KUBERNETES_CONFORMANCE_TEST Y
29+
ENV KUBECTL_PATH=/usr/bin/kubectl
30+
ENV KUBERNETES_PROVIDER=skeleton
31+
ENV KUBERNETES_CONFORMANCE_TEST=Y
3732

3833
WORKDIR /workdir/test/e2e
3934

test/e2e/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ build.push: build.docker
4848
build.push.multiarch: build.linux.amd64 #build.linux.arm64
4949
docker buildx create --config /etc/cdp-buildkitd.toml --driver-opt network=host --bootstrap --use
5050
# docker buildx build --rm --build-arg KUBE_VERSION=$(KUBE_VERSION) -t "$(IMAGE):$(TAG)" --platform linux/amd64,linux/arm64 --push -f $(DOCKERFILE) ../..
51-
docker buildx build --rm --build-arg KUBE_VERSION=$(KUBE_VERSION) -t "$(IMAGE):$(TAG)" --platform linux/amd64 --push -f $(DOCKERFILE) ../..
51+
docker buildx build --quiet --rm --build-arg KUBE_VERSION=$(KUBE_VERSION) -t "$(IMAGE):$(TAG)" --platform linux/amd64 --push -f $(DOCKERFILE) ../..
5252

5353
clean:
5454
rm -rf e2e.test

0 commit comments

Comments
 (0)