diff --git a/.hadolint.yaml b/.hadolint.yaml index f1c324b8cfbbc669f646b8e6f18f2b472204f993..1c305f9d21756dc4aeb631d0a1c4d62315f61439 100644 --- a/.hadolint.yaml +++ b/.hadolint.yaml @@ -3,5 +3,7 @@ ignored: - DL3008 # disable explicit version for apk install - DL3018 + # disable check for consecutive `RUN` instructions + - DL3059 trustedRegistries: - docker.io diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2 index 095c295a21d7ab10461df819c113ff34b1c77f77..8c5157f481e1bf0cb47da27f9cbe3cbbc8c966b7 100644 --- a/docker/Dockerfile.j2 +++ b/docker/Dockerfile.j2 @@ -106,7 +106,6 @@ ENV RUSTFLAGS='-Clink-arg=/usr/local/musl/{{ package_arch_target }}/lib/libatomi {% elif "arm" in target_file %} # # Install required build libs for {{ package_arch_name }} architecture. -# hadolint ignore=DL3059 RUN dpkg --add-architecture {{ package_arch_name }} \ && apt-get update \ && apt-get install -y \ @@ -178,7 +177,6 @@ RUN touch src/main.rs # Builds again, this time it'll just be # your actual source files being built -# hadolint ignore=DL3059 RUN {{ mount_rust_cache -}} cargo build --features ${DB} --release{{ package_arch_target_param }} ######################## RUNTIME IMAGE ######################## @@ -195,7 +193,6 @@ ENV ROCKET_PROFILE="release" \ {% if "amd64" not in target_file %} -# hadolint ignore=DL3059 RUN [ "cross-build-start" ] {% endif %} @@ -222,13 +219,11 @@ RUN mkdir /data \ {% if "armv6" in target_file and "alpine" not in target_file %} # In the Balena Bullseye images for armv6/rpi-debian there is a missing symlink. # This symlink was there in the buster images, and for some reason this is needed. -# hadolint ignore=DL3059 RUN ln -v -s /lib/ld-linux-armhf.so.3 /lib/ld-linux.so.3 {% endif -%} {% if "amd64" not in target_file %} -# hadolint ignore=DL3059 RUN [ "cross-build-end" ] {% endif %} diff --git a/docker/amd64/Dockerfile b/docker/amd64/Dockerfile index 09b959dd878db7a837e15756c1b5af60403726dc..281146f7b8d43158e1bc02987e202c20e371ee4a 100644 --- a/docker/amd64/Dockerfile +++ b/docker/amd64/Dockerfile @@ -81,7 +81,6 @@ RUN touch src/main.rs # Builds again, this time it'll just be # your actual source files being built -# hadolint ignore=DL3059 RUN cargo build --features ${DB} --release ######################## RUNTIME IMAGE ######################## diff --git a/docker/amd64/Dockerfile.alpine b/docker/amd64/Dockerfile.alpine index eba7a10ff8b2316ef42e80def078c2e08825a740..6dd624b6f3e31b24dda2bb90244d1ac6c9434261 100644 --- a/docker/amd64/Dockerfile.alpine +++ b/docker/amd64/Dockerfile.alpine @@ -75,7 +75,6 @@ RUN touch src/main.rs # Builds again, this time it'll just be # your actual source files being built -# hadolint ignore=DL3059 RUN cargo build --features ${DB} --release --target=x86_64-unknown-linux-musl ######################## RUNTIME IMAGE ######################## diff --git a/docker/amd64/Dockerfile.buildkit b/docker/amd64/Dockerfile.buildkit index ae84102676fafc949a6dc41858b06a78cf013eda..12e85211c02243bd1c5d7fcc577bee02f28599db 100644 --- a/docker/amd64/Dockerfile.buildkit +++ b/docker/amd64/Dockerfile.buildkit @@ -81,7 +81,6 @@ RUN touch src/main.rs # Builds again, this time it'll just be # your actual source files being built -# hadolint ignore=DL3059 RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.cargo/registry cargo build --features ${DB} --release ######################## RUNTIME IMAGE ######################## diff --git a/docker/amd64/Dockerfile.buildkit.alpine b/docker/amd64/Dockerfile.buildkit.alpine index e1a1de9bfe73bf20c8f179904d82b17d6148634e..ba45c39b128b921cfc9257c4d9007763e4f4b5ed 100644 --- a/docker/amd64/Dockerfile.buildkit.alpine +++ b/docker/amd64/Dockerfile.buildkit.alpine @@ -75,7 +75,6 @@ RUN touch src/main.rs # Builds again, this time it'll just be # your actual source files being built -# hadolint ignore=DL3059 RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.cargo/registry cargo build --features ${DB} --release --target=x86_64-unknown-linux-musl ######################## RUNTIME IMAGE ######################## diff --git a/docker/arm64/Dockerfile b/docker/arm64/Dockerfile index eabadb475b2af6ad148df36658d69e534f805fd5..093afadd90b98867188704bffabcc821c204065c 100644 --- a/docker/arm64/Dockerfile +++ b/docker/arm64/Dockerfile @@ -46,7 +46,6 @@ RUN mkdir -pv "${CARGO_HOME}" \ # # Install required build libs for arm64 architecture. -# hadolint ignore=DL3059 RUN dpkg --add-architecture arm64 \ && apt-get update \ && apt-get install -y \ @@ -101,7 +100,6 @@ RUN touch src/main.rs # Builds again, this time it'll just be # your actual source files being built -# hadolint ignore=DL3059 RUN cargo build --features ${DB} --release --target=aarch64-unknown-linux-gnu ######################## RUNTIME IMAGE ######################## @@ -113,7 +111,6 @@ ENV ROCKET_PROFILE="release" \ ROCKET_ADDRESS=0.0.0.0 \ ROCKET_PORT=80 -# hadolint ignore=DL3059 RUN [ "cross-build-start" ] # Create data folder and Install needed libraries @@ -128,7 +125,6 @@ RUN mkdir /data \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -# hadolint ignore=DL3059 RUN [ "cross-build-end" ] VOLUME /data diff --git a/docker/arm64/Dockerfile.alpine b/docker/arm64/Dockerfile.alpine index f880d8ec6e2ac14b8fb8184dfc137286ea632e5b..83bf074577f2fccf09d5e891d4bde8ca77006a16 100644 --- a/docker/arm64/Dockerfile.alpine +++ b/docker/arm64/Dockerfile.alpine @@ -75,7 +75,6 @@ RUN touch src/main.rs # Builds again, this time it'll just be # your actual source files being built -# hadolint ignore=DL3059 RUN cargo build --features ${DB} --release --target=aarch64-unknown-linux-musl ######################## RUNTIME IMAGE ######################## @@ -89,7 +88,6 @@ ENV ROCKET_PROFILE="release" \ SSL_CERT_DIR=/etc/ssl/certs -# hadolint ignore=DL3059 RUN [ "cross-build-start" ] # Create data folder and Install needed libraries @@ -100,7 +98,6 @@ RUN mkdir /data \ curl \ ca-certificates -# hadolint ignore=DL3059 RUN [ "cross-build-end" ] VOLUME /data diff --git a/docker/arm64/Dockerfile.buildkit b/docker/arm64/Dockerfile.buildkit index dc5620e469f8062adf20321717b0a7f4580a2011..cdabd35cc896d1d356e8174b64528463d73e6a79 100644 --- a/docker/arm64/Dockerfile.buildkit +++ b/docker/arm64/Dockerfile.buildkit @@ -46,7 +46,6 @@ RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/. # # Install required build libs for arm64 architecture. -# hadolint ignore=DL3059 RUN dpkg --add-architecture arm64 \ && apt-get update \ && apt-get install -y \ @@ -101,7 +100,6 @@ RUN touch src/main.rs # Builds again, this time it'll just be # your actual source files being built -# hadolint ignore=DL3059 RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.cargo/registry cargo build --features ${DB} --release --target=aarch64-unknown-linux-gnu ######################## RUNTIME IMAGE ######################## @@ -113,7 +111,6 @@ ENV ROCKET_PROFILE="release" \ ROCKET_ADDRESS=0.0.0.0 \ ROCKET_PORT=80 -# hadolint ignore=DL3059 RUN [ "cross-build-start" ] # Create data folder and Install needed libraries @@ -128,7 +125,6 @@ RUN mkdir /data \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -# hadolint ignore=DL3059 RUN [ "cross-build-end" ] VOLUME /data diff --git a/docker/arm64/Dockerfile.buildkit.alpine b/docker/arm64/Dockerfile.buildkit.alpine index b8fc36c1c268ccfa303f4fa51dc5c14e726055c7..837a7a39cc76f2df8c4c501aa0ba74ec9b6889da 100644 --- a/docker/arm64/Dockerfile.buildkit.alpine +++ b/docker/arm64/Dockerfile.buildkit.alpine @@ -75,7 +75,6 @@ RUN touch src/main.rs # Builds again, this time it'll just be # your actual source files being built -# hadolint ignore=DL3059 RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.cargo/registry cargo build --features ${DB} --release --target=aarch64-unknown-linux-musl ######################## RUNTIME IMAGE ######################## @@ -89,7 +88,6 @@ ENV ROCKET_PROFILE="release" \ SSL_CERT_DIR=/etc/ssl/certs -# hadolint ignore=DL3059 RUN [ "cross-build-start" ] # Create data folder and Install needed libraries @@ -100,7 +98,6 @@ RUN mkdir /data \ curl \ ca-certificates -# hadolint ignore=DL3059 RUN [ "cross-build-end" ] VOLUME /data diff --git a/docker/armv6/Dockerfile b/docker/armv6/Dockerfile index 7ddbdee8d86cf8c59869e643202cbe9d7f2b0351..84baa7b62cc6df32434a9bd59822d0166bbf0caf 100644 --- a/docker/armv6/Dockerfile +++ b/docker/armv6/Dockerfile @@ -46,7 +46,6 @@ RUN mkdir -pv "${CARGO_HOME}" \ # # Install required build libs for armel architecture. -# hadolint ignore=DL3059 RUN dpkg --add-architecture armel \ && apt-get update \ && apt-get install -y \ @@ -101,7 +100,6 @@ RUN touch src/main.rs # Builds again, this time it'll just be # your actual source files being built -# hadolint ignore=DL3059 RUN cargo build --features ${DB} --release --target=arm-unknown-linux-gnueabi ######################## RUNTIME IMAGE ######################## @@ -113,7 +111,6 @@ ENV ROCKET_PROFILE="release" \ ROCKET_ADDRESS=0.0.0.0 \ ROCKET_PORT=80 -# hadolint ignore=DL3059 RUN [ "cross-build-start" ] # Create data folder and Install needed libraries @@ -130,10 +127,8 @@ RUN mkdir /data \ # In the Balena Bullseye images for armv6/rpi-debian there is a missing symlink. # This symlink was there in the buster images, and for some reason this is needed. -# hadolint ignore=DL3059 RUN ln -v -s /lib/ld-linux-armhf.so.3 /lib/ld-linux.so.3 -# hadolint ignore=DL3059 RUN [ "cross-build-end" ] VOLUME /data diff --git a/docker/armv6/Dockerfile.alpine b/docker/armv6/Dockerfile.alpine index 65bb552bdb64736426732f53ce3f444c82a74207..1f969d7cc6fb83bbe7bb51329fcc1ae54b8e12e7 100644 --- a/docker/armv6/Dockerfile.alpine +++ b/docker/armv6/Dockerfile.alpine @@ -77,7 +77,6 @@ RUN touch src/main.rs # Builds again, this time it'll just be # your actual source files being built -# hadolint ignore=DL3059 RUN cargo build --features ${DB} --release --target=arm-unknown-linux-musleabi ######################## RUNTIME IMAGE ######################## @@ -91,7 +90,6 @@ ENV ROCKET_PROFILE="release" \ SSL_CERT_DIR=/etc/ssl/certs -# hadolint ignore=DL3059 RUN [ "cross-build-start" ] # Create data folder and Install needed libraries @@ -102,7 +100,6 @@ RUN mkdir /data \ curl \ ca-certificates -# hadolint ignore=DL3059 RUN [ "cross-build-end" ] VOLUME /data diff --git a/docker/armv6/Dockerfile.buildkit b/docker/armv6/Dockerfile.buildkit index 7b9aab8adfcb82c531791688d806d078a06cacbc..1e33a25fe308c9e4ab60bdab704f474d335c2b87 100644 --- a/docker/armv6/Dockerfile.buildkit +++ b/docker/armv6/Dockerfile.buildkit @@ -46,7 +46,6 @@ RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/. # # Install required build libs for armel architecture. -# hadolint ignore=DL3059 RUN dpkg --add-architecture armel \ && apt-get update \ && apt-get install -y \ @@ -101,7 +100,6 @@ RUN touch src/main.rs # Builds again, this time it'll just be # your actual source files being built -# hadolint ignore=DL3059 RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.cargo/registry cargo build --features ${DB} --release --target=arm-unknown-linux-gnueabi ######################## RUNTIME IMAGE ######################## @@ -113,7 +111,6 @@ ENV ROCKET_PROFILE="release" \ ROCKET_ADDRESS=0.0.0.0 \ ROCKET_PORT=80 -# hadolint ignore=DL3059 RUN [ "cross-build-start" ] # Create data folder and Install needed libraries @@ -130,10 +127,8 @@ RUN mkdir /data \ # In the Balena Bullseye images for armv6/rpi-debian there is a missing symlink. # This symlink was there in the buster images, and for some reason this is needed. -# hadolint ignore=DL3059 RUN ln -v -s /lib/ld-linux-armhf.so.3 /lib/ld-linux.so.3 -# hadolint ignore=DL3059 RUN [ "cross-build-end" ] VOLUME /data diff --git a/docker/armv6/Dockerfile.buildkit.alpine b/docker/armv6/Dockerfile.buildkit.alpine index 4bced53dbe592b9797feec2893dd59411afc7224..d0f5cfbeb5b8bfb6d82ad3066111e20584eeaf72 100644 --- a/docker/armv6/Dockerfile.buildkit.alpine +++ b/docker/armv6/Dockerfile.buildkit.alpine @@ -77,7 +77,6 @@ RUN touch src/main.rs # Builds again, this time it'll just be # your actual source files being built -# hadolint ignore=DL3059 RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.cargo/registry cargo build --features ${DB} --release --target=arm-unknown-linux-musleabi ######################## RUNTIME IMAGE ######################## @@ -91,7 +90,6 @@ ENV ROCKET_PROFILE="release" \ SSL_CERT_DIR=/etc/ssl/certs -# hadolint ignore=DL3059 RUN [ "cross-build-start" ] # Create data folder and Install needed libraries @@ -102,7 +100,6 @@ RUN mkdir /data \ curl \ ca-certificates -# hadolint ignore=DL3059 RUN [ "cross-build-end" ] VOLUME /data diff --git a/docker/armv7/Dockerfile b/docker/armv7/Dockerfile index bcbf946ca57d9bcf4ab033139aff57ca52bdc258..8df12612eea1a16a92b122ba88c085949d17da45 100644 --- a/docker/armv7/Dockerfile +++ b/docker/armv7/Dockerfile @@ -46,7 +46,6 @@ RUN mkdir -pv "${CARGO_HOME}" \ # # Install required build libs for armhf architecture. -# hadolint ignore=DL3059 RUN dpkg --add-architecture armhf \ && apt-get update \ && apt-get install -y \ @@ -101,7 +100,6 @@ RUN touch src/main.rs # Builds again, this time it'll just be # your actual source files being built -# hadolint ignore=DL3059 RUN cargo build --features ${DB} --release --target=armv7-unknown-linux-gnueabihf ######################## RUNTIME IMAGE ######################## @@ -113,7 +111,6 @@ ENV ROCKET_PROFILE="release" \ ROCKET_ADDRESS=0.0.0.0 \ ROCKET_PORT=80 -# hadolint ignore=DL3059 RUN [ "cross-build-start" ] # Create data folder and Install needed libraries @@ -128,7 +125,6 @@ RUN mkdir /data \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -# hadolint ignore=DL3059 RUN [ "cross-build-end" ] VOLUME /data diff --git a/docker/armv7/Dockerfile.alpine b/docker/armv7/Dockerfile.alpine index 6d14ae34d9299ad24610421d130c08913da4abbc..1872e54ee1d6b5fc331259e13c4a7524547e5c26 100644 --- a/docker/armv7/Dockerfile.alpine +++ b/docker/armv7/Dockerfile.alpine @@ -75,7 +75,6 @@ RUN touch src/main.rs # Builds again, this time it'll just be # your actual source files being built -# hadolint ignore=DL3059 RUN cargo build --features ${DB} --release --target=armv7-unknown-linux-musleabihf ######################## RUNTIME IMAGE ######################## @@ -89,7 +88,6 @@ ENV ROCKET_PROFILE="release" \ SSL_CERT_DIR=/etc/ssl/certs -# hadolint ignore=DL3059 RUN [ "cross-build-start" ] # Create data folder and Install needed libraries @@ -100,7 +98,6 @@ RUN mkdir /data \ curl \ ca-certificates -# hadolint ignore=DL3059 RUN [ "cross-build-end" ] VOLUME /data diff --git a/docker/armv7/Dockerfile.buildkit b/docker/armv7/Dockerfile.buildkit index 0084526be232c38596935dbb399805bec6bc37bf..4ff8364a10ed262c1340e82aa3e154adeb4eee2a 100644 --- a/docker/armv7/Dockerfile.buildkit +++ b/docker/armv7/Dockerfile.buildkit @@ -46,7 +46,6 @@ RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/. # # Install required build libs for armhf architecture. -# hadolint ignore=DL3059 RUN dpkg --add-architecture armhf \ && apt-get update \ && apt-get install -y \ @@ -101,7 +100,6 @@ RUN touch src/main.rs # Builds again, this time it'll just be # your actual source files being built -# hadolint ignore=DL3059 RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.cargo/registry cargo build --features ${DB} --release --target=armv7-unknown-linux-gnueabihf ######################## RUNTIME IMAGE ######################## @@ -113,7 +111,6 @@ ENV ROCKET_PROFILE="release" \ ROCKET_ADDRESS=0.0.0.0 \ ROCKET_PORT=80 -# hadolint ignore=DL3059 RUN [ "cross-build-start" ] # Create data folder and Install needed libraries @@ -128,7 +125,6 @@ RUN mkdir /data \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -# hadolint ignore=DL3059 RUN [ "cross-build-end" ] VOLUME /data diff --git a/docker/armv7/Dockerfile.buildkit.alpine b/docker/armv7/Dockerfile.buildkit.alpine index d29465bb0a392988ba329b900cd5e09207f0fed9..2fc23849102882fa4f9bfcfde89d9320cecee7fd 100644 --- a/docker/armv7/Dockerfile.buildkit.alpine +++ b/docker/armv7/Dockerfile.buildkit.alpine @@ -75,7 +75,6 @@ RUN touch src/main.rs # Builds again, this time it'll just be # your actual source files being built -# hadolint ignore=DL3059 RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.cargo/registry cargo build --features ${DB} --release --target=armv7-unknown-linux-musleabihf ######################## RUNTIME IMAGE ######################## @@ -89,7 +88,6 @@ ENV ROCKET_PROFILE="release" \ SSL_CERT_DIR=/etc/ssl/certs -# hadolint ignore=DL3059 RUN [ "cross-build-start" ] # Create data folder and Install needed libraries @@ -100,7 +98,6 @@ RUN mkdir /data \ curl \ ca-certificates -# hadolint ignore=DL3059 RUN [ "cross-build-end" ] VOLUME /data