From 61839eeeeb0e44477940f5a1ee9d478a1d12deaa Mon Sep 17 00:00:00 2001
From: Azanul <azanulhaque@gmail.com>
Date: Sat, 7 Oct 2023 00:56:19 +0530
Subject: [PATCH] CI fail

Signed-off-by: Azanul <azanulhaque@gmail.com>
---
 .github/workflows/docker-image.yml | 3 +++
 Dockerfile                         | 9 ++++++---
 Dockerfile.exporter                | 2 ++
 hadolint.yaml                      | 3 ---
 4 files changed, 11 insertions(+), 6 deletions(-)
 delete mode 100644 hadolint.yaml

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index d2b9970..4674582 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -14,6 +14,7 @@ jobs:
       name: Lint Dockerfile
       with:
         dockerfile: Dockerfile
+        ignore: DL3007,DL3018
 
     - name: Build Dockerfile
       run: docker build . --file Dockerfile --tag redis:$(date +%s)
@@ -27,6 +28,7 @@ jobs:
       name: Lint Dockerfile.exporter
       with:
         dockerfile: Dockerfile.exporter
+        ignore: DL3007,DL3018
 
     - name: Build Dockerfile.exporter
       run: docker build . --file Dockerfile.exporter --tag redis-exporter:$(date +%s)
@@ -40,6 +42,7 @@ jobs:
       name: Lint Dockerfile.sentinel
       with:
         dockerfile: Dockerfile.sentinel
+        ignore: DL3007,DL3018
 
     - name: Build Dockerfile.sentinel
       run: docker build . --file Dockerfile.sentinel --tag redis-sentinel:$(date +%s)
diff --git a/Dockerfile b/Dockerfile
index da54a6f..ede992f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,9 +17,12 @@ RUN apk add --no-cache su-exec tzdata make curl build-base linux-headers bash op
 WORKDIR /tmp
 
 RUN curl -fL -Lo redis-${REDIS_VERSION}.tar.gz ${REDIS_DOWNLOAD_URL}/redis-${REDIS_VERSION}.tar.gz && \
-    tar xvzf redis-${REDIS_VERSION}.tar.gz && \
-    make -C redis-${REDIS_VERSION} && \
-    make -C redis-${REDIS_VERSION} install BUILD_TLS=yes
+    tar xvzf redis-${REDIS_VERSION}.tar.gz
+
+WORKDIR /tmp/redis-${REDIS_VERSION}
+
+RUN make && \
+    make install BUILD_TLS=yes
 
 FROM alpine:3.15
 
diff --git a/Dockerfile.exporter b/Dockerfile.exporter
index 2a71dfe..55c412d 100644
--- a/Dockerfile.exporter
+++ b/Dockerfile.exporter
@@ -6,6 +6,8 @@ ARG EXPORTER_URL="https://github.com/oliver006/redis_exporter/releases/download"
 
 ARG REDIS_EXPORTER_VERSION="1.48.0"
 
+WORKDIR /tmp
+
 RUN apk add --no-cache curl ca-certificates && \
     curl -fL -Lo redis_exporter-v${REDIS_EXPORTER_VERSION}.linux-$TARGETARCH.tar.gz \
     ${EXPORTER_URL}/v${REDIS_EXPORTER_VERSION}/redis_exporter-v${REDIS_EXPORTER_VERSION}.linux-$TARGETARCH.tar.gz && \
diff --git a/hadolint.yaml b/hadolint.yaml
deleted file mode 100644
index f02c9fb..0000000
--- a/hadolint.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-ignored:
-  - DL3007
-  - DL3018
\ No newline at end of file