Skip to content

Commit 063a5fd

Browse files
hadolint: ignore DL3006 in general
it is used to prevent using docker images without tag, but for us linuxkit fills in the tag Signed-off-by: Christoph Ostarek <[email protected]>
1 parent dbfa97f commit 063a5fd

File tree

12 files changed

+5
-26
lines changed

12 files changed

+5
-26
lines changed

.hadolint.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
ignored:
33
- DL3059
44
- DL3002
5+
- DL3006

pkg/alpine/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ FROM lfedge/eve-alpine:e799def68af51dba83ec5a41f34bd0109704574f AS cache
55
FROM lfedge/eve-alpine:b96ae7c5b776702cdc7596e3722e40cc0d353ad7 AS cache-riscv64
66
FROM cache AS cache-amd64
77
FROM cache AS cache-arm64
8-
# hadolint ignore=DL3006
98
FROM cache-${TARGETARCH} AS cache-build
109

1110
ARG ALPINE_VERSION=3.16
@@ -76,7 +75,6 @@ ENV EVE_TARGET_ARCH=riscv64
7675

7776
# we merge layers in previous step
7877
# so we should avoid large possible diff
79-
# hadolint ignore=DL3006
8078
FROM final-${TARGETARCH}
8179
COPY --from=compactor / /
8280
ENV GOTOOLCHAIN=local

pkg/bpftrace/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,4 @@ FROM bin AS bin-amd64
5050
FROM bin AS bin-arm64
5151
FROM scratch AS bin-riscv64
5252

53-
# hadolint ignore=DL3006
5453
FROM bin-${TARGETARCH} AS bpftrace

pkg/bsp-imx/Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ FROM ${EVE_ALPINE_IMAGE} AS build-native
1414
ARG BUILD_PKGS_BASE
1515
RUN BUILD_PKGS="${BUILD_PKGS_BASE}" eve-alpine-deploy.sh
1616

17-
# hadolint ignore=DL3006,DL3029
17+
# hadolint ignore=DL3029
1818
FROM --platform=${BUILDPLATFORM} ${EVE_ALPINE_IMAGE} AS build-cross
1919
ARG BUILD_PKGS_BASE
2020
RUN BUILD_PKGS="${BUILD_PKGS_BASE}" eve-alpine-deploy.sh
@@ -23,7 +23,6 @@ RUN BUILD_PKGS="${BUILD_PKGS_BASE}" eve-alpine-deploy.sh
2323
FROM --platform=${BUILDPLATFORM} lfedge/eve-cross-compilers:f476a79bcd086759592a105a49f9ed5bfa2c4ffa AS cross-compilers
2424

2525
# will use several packages from target arch and copy them to sysroot
26-
# hadolint ignore=DL3006
2726
FROM ${EVE_ALPINE_IMAGE} AS cross-compile-libs
2827
ENV PKGS="musl-dev libgcc libintl libuuid libtirpc libblkid"
2928
RUN eve-alpine-deploy.sh
@@ -36,7 +35,6 @@ ENV EVE_TARGET_ARCH=aarch64
3635
FROM build-cross AS build-cross-target-riscv64
3736
ENV EVE_TARGET_ARCH=riscv64
3837

39-
# hadolint ignore=DL3006
4038
FROM build-cross-target-${TARGETARCH} AS build-cross-target
4139
ENV CROSS_COMPILE_ENV="${EVE_TARGET_ARCH}-alpine-linux-musl-"
4240
COPY --from=cross-compilers /packages /packages
@@ -54,7 +52,6 @@ FROM build-native AS target-amd64-build-amd64
5452
FROM build-native AS target-arm64-build-arm64
5553
FROM build-native AS target-riscv64-build-riscv64
5654

57-
# hadolint ignore=DL3006
5855
FROM target-${TARGETARCH}-build-${BUILDARCH} AS build
5956

6057
SHELL ["/bin/bash", "-eo", "pipefail", "-c"]

pkg/cross-compilers/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ FROM build-base AS build-armhf
4949
# we cannot build cross-compilers without additional patches
5050
FROM lfedge/eve-alpine:745ae9066273c73b0fd879c4ba4ff626a8392d04 AS build-riscv64
5151

52-
# hadolint ignore=DL3006
5352
FROM build-${TARGETARCH} AS build
5453
RUN mkdir -p /packages
5554

pkg/fscrypt/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ FROM build-base AS build-amd64
88
FROM build-base AS build-arm64
99
FROM build-base AS build-riscv64
1010

11-
# hadolint ignore=DL3006
1211
FROM build-${TARGETARCH} AS build
1312

1413
ENV BUILD_PKGS git gcc make libc-dev linux-pam-dev m4 findutils util-linux make patch
@@ -29,4 +28,4 @@ RUN set -e && for patch in *.patch; do \
2928
RUN make -j "$(getconf _NPROCESSORS_ONLN)" && make DESTDIR="/out/opt/zededa" PREFIX="" install
3029

3130
FROM scratch
32-
COPY --from=build /out/opt/zededa/bin /opt/zededa/bin
31+
COPY --from=build /out/opt/zededa/bin /opt/zededa/bin

pkg/grub/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ ENV GRUB_COMMIT=2.06
5050
ENV GRUB_PATCHES="patches-${GRUB_COMMIT} patches-riscv64-${GRUB_COMMIT}"
5151
ENV GRUB_PLATFORM=efi
5252

53-
# hadolint ignore=DL3006
5453
FROM grub-build-${TARGETARCH} AS grub-build
5554

5655
ENV GRUB_REPO=https://cgit.git.savannah.gnu.org/cgit/grub.git

pkg/installer/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ ENV CARGO_BUILD_TARGET="aarch64-unknown-linux-musl"
1616
FROM rust-host AS target-riscv64
1717
ENV CARGO_BUILD_TARGET="riscv64gc-unknown-linux-gnu"
1818

19-
# hadolint ignore=DL3006
2019
FROM target-$TARGETARCH AS rust
2120

2221
WORKDIR /usr/local/my-installer

pkg/optee-os/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ ARG BUILD_PKGS_BASE="autoconf automake bash binutils binutils-dev build-base bc
66
# we use the same image in several places
77
ARG EVE_ALPINE_IMAGE=lfedge/eve-alpine:745ae9066273c73b0fd879c4ba4ff626a8392d04
88

9-
# hadolint ignore=DL3006
109
FROM ${EVE_ALPINE_IMAGE} AS build-native
1110
ARG BUILD_PKGS_BASE
1211
RUN BUILD_PKGS="${BUILD_PKGS_BASE}" eve-alpine-deploy.sh
1312

14-
# hadolint ignore=DL3006,DL3029
13+
# hadolint ignore=DL3029
1514
FROM --platform=${BUILDPLATFORM} ${EVE_ALPINE_IMAGE} AS build-cross
1615
ARG BUILD_PKGS_BASE
1716
RUN BUILD_PKGS="${BUILD_PKGS_BASE}" eve-alpine-deploy.sh
@@ -20,7 +19,6 @@ RUN BUILD_PKGS="${BUILD_PKGS_BASE}" eve-alpine-deploy.sh
2019
FROM --platform=${BUILDPLATFORM} lfedge/eve-cross-compilers:f476a79bcd086759592a105a49f9ed5bfa2c4ffa AS cross-compilers
2120

2221
# will use several packages from target arch and copy them to sysroot
23-
# hadolint ignore=DL3006
2422
FROM ${EVE_ALPINE_IMAGE} AS cross-compile-libs
2523
ENV PKGS musl-dev libgcc libintl libuuid libtirpc libblkid libattr
2624
RUN eve-alpine-deploy.sh
@@ -33,7 +31,6 @@ ENV EVE_TARGET_ARCH=aarch64
3331
FROM build-cross AS build-cross-target-riscv64
3432
ENV EVE_TARGET_ARCH=riscv64
3533

36-
# hadolint ignore=DL3006
3734
FROM build-cross-target-${TARGETARCH} AS build-cross-target
3835
ENV CROSS_COMPILE_ENV="${EVE_TARGET_ARCH}"-alpine-linux-musl-
3936
ENV CROSS_COMPILE_ARM32_ENV="armv6-alpine-linux-musleabihf-"
@@ -52,7 +49,6 @@ FROM build-native AS target-amd64-build-amd64
5249
FROM build-native AS target-arm64-build-arm64
5350
FROM build-native AS target-riscv64-build-riscv64
5451

55-
# hadolint ignore=DL3006
5652
FROM target-${TARGETARCH}-build-${BUILDARCH} AS build
5753

5854
# ARM32 compiler is needed on all platforms

pkg/pillar/Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,11 @@ RUN while read -r x; do \
2727
fi \
2828
done < /etc/zfs-files
2929

30-
# hadolint ignore=DL3006
3130
FROM ${REL_HASH_LFEDGE_EVE_ALPINE} AS build-native
3231
ARG BUILD_PKGS_BASE
3332
RUN BUILD_PKGS="${BUILD_PKGS_BASE}" eve-alpine-deploy.sh
3433

35-
# hadolint ignore=DL3006,DL3029
34+
# hadolint ignore=DL3029
3635
FROM --platform=${BUILDPLATFORM} ${REL_HASH_LFEDGE_EVE_ALPINE} AS build-cross
3736
ARG BUILD_PKGS_BASE
3837
RUN BUILD_PKGS="${BUILD_PKGS_BASE}" eve-alpine-deploy.sh
@@ -41,7 +40,6 @@ RUN BUILD_PKGS="${BUILD_PKGS_BASE}" eve-alpine-deploy.sh
4140
FROM --platform=${BUILDPLATFORM} ${REL_HASH_LFEDGE_EVE_CROSS_COMPILERS} AS cross-compilers
4241

4342
# will use several packages from target arch and copy them to sysroot
44-
# hadolint ignore=DL3006
4543
FROM ${REL_HASH_LFEDGE_EVE_ALPINE} AS cross-compile-libs
4644
ENV PKGS musl-dev libgcc libintl libuuid libtirpc libblkid linux-headers
4745
RUN eve-alpine-deploy.sh
@@ -54,7 +52,6 @@ ENV EVE_TARGET_ARCH=aarch64
5452
FROM build-cross AS build-cross-target-amd64
5553
ENV EVE_TARGET_ARCH=x86_64
5654

57-
# hadolint ignore=DL3006
5855
FROM build-cross-target-${TARGETARCH} AS build-cross-target
5956
ENV CROSS_COMPILE_ENV="${EVE_TARGET_ARCH}"-alpine-linux-musl-
6057
COPY --from=cross-compilers /packages /packages
@@ -69,7 +66,6 @@ FROM build-cross-target AS target-amd64-build-arm64
6966
FROM build-native AS target-amd64-build-amd64
7067
FROM build-native AS target-arm64-build-arm64
7168

72-
# hadolint ignore=DL3006
7369
FROM target-${TARGETARCH}-build-${BUILDARCH} AS build
7470
ARG DEV=n
7571
ARG TEST_TOOLS=n
@@ -148,7 +144,6 @@ FROM ${REL_HASH_LFEDGE_EVE_GPT_TOOLS} AS gpttools
148144

149145
# collector collects everything together and then does any processing like stripping binaries.
150146
# We use this interim "collector" so that we can do processing.
151-
# hadolint ignore=DL3006
152147
FROM ${REL_HASH_LFEDGE_EVE_ALPINE} AS collector
153148
ENV BUILD_PKGS patch
154149
ENV PKGS alpine-baselayout musl-utils libtasn1-progs pciutils yajl xz bash iptables ip6tables iproute2 \

0 commit comments

Comments
 (0)