From 61ba41ffe19a353a0b288688e403efb325ada20c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tibor=20=C5=A0imko?= <tibor.simko@cern.ch>
Date: Tue, 31 Oct 2023 15:05:56 +0100
Subject: [PATCH] docker: hadolint upgrade

---
 .hadolint.yaml | 4 ----
 Dockerfile     | 6 ++++--
 Makefile       | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)
 delete mode 100644 .hadolint.yaml

diff --git a/.hadolint.yaml b/.hadolint.yaml
deleted file mode 100644
index c1b4376..0000000
--- a/.hadolint.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-ignored:
-  - DL3003
-  - DL3008
-  - DL3015
diff --git a/Dockerfile b/Dockerfile
index c869e04..0782a15 100644
--- 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
index 19ef0c2..09ecd9c 100644
--- 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)