docker: hadolint upgrade

reanahub · Oct 31, 2023 · 61ba41f · 61ba41f
1 parent e5b4a5a
commit 61ba41f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.hadolint.yaml b/.hadolint.yaml
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,8 @@
 # Environment: ROOT6 on Ubuntu/Bionic:
 FROM docker.io/library/ubuntu:bionic
-RUN apt-get -y update && \
-    apt-get -y install \
+# hadolint ignore=DL3008
+RUN apt-get update -y && \
+    apt-get install --no-install-recommends -y \
         binutils \
         build-essential \
         cmake \
@@ -43,6 +44,7 @@ RUN apt-get -y update && \
     apt-get -y clean
 
 ENV ROOTSYS /usr/local
+# hadolint ignore=DL3003
 RUN git clone --quiet --depth 1 --branch v6-18-04 http://root.cern.ch/git/root.git /code/root && \
     cd /code && \
     mkdir _build && \

diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ test:
 	docker run -i -t --rm $(IMAGE) root-config --version | grep -q ^6
 
 lint:
-	docker run --rm -i -v `pwd`/.hadolint.yaml:/root/.config/hadolint.yaml docker.io/hadolint/hadolint:v1.18.2 < Dockerfile
+	docker run --rm -i docker.io/hadolint/hadolint:v2.12.0 < Dockerfile
 
 push:
 	docker push $(IMAGE)