Docker files lint fixes

Signed-off-by: Azanul <[email protected]>
OT-CONTAINER-KIT · Oct 6, 2023 · 4354b10 · 4354b10
1 parent d0b7256
commit 4354b10
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 18 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,22 +4,22 @@ LABEL maintainer="Opstree Solutions"
 
 ARG TARGETARCH
 
-LABEL VERSION=1.0 \
-      ARCH=$TARGETARCH \
-      DESCRIPTION="A production grade performance tuned redis docker image created by Opstree Solutions"
+LABEL version=1.0 \
+      arch=$TARGETARCH \
+      description="A production grade performance tuned redis docker image created by Opstree Solutions"
 
 ARG REDIS_DOWNLOAD_URL="http://download.redis.io/"
 
 ARG REDIS_VERSION="stable"
 
 RUN apk add --no-cache su-exec tzdata make curl build-base linux-headers bash openssl-dev
 
-RUN curl -fL -Lo /tmp/redis-${REDIS_VERSION}.tar.gz ${REDIS_DOWNLOAD_URL}/redis-${REDIS_VERSION}.tar.gz && \
-    cd /tmp && \
+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 && \
-    cd redis-${REDIS_VERSION} && \
-    make && \
-    make install BUILD_TLS=yes
+    make -C redis-${REDIS_VERSION} && \
+    make -C redis-${REDIS_VERSION} install BUILD_TLS=yes
 
 FROM alpine:3.15
 

diff --git a/Dockerfile.exporter b/Dockerfile.exporter
@@ -6,11 +6,11 @@ ARG EXPORTER_URL="https://github.com/oliver006/redis_exporter/releases/download"
 
 ARG REDIS_EXPORTER_VERSION="1.48.0"
 
-RUN  apk add --no-cache curl ca-certificates && \
-      curl -fL -Lo /tmp/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 && \
-      cd /tmp && tar -xvzf redis_exporter-v${REDIS_EXPORTER_VERSION}.linux-$TARGETARCH.tar.gz && \
-      mv redis_exporter-v${REDIS_EXPORTER_VERSION}.linux-$TARGETARCH redis_exporter
+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 && \
+    tar -xvzf redis_exporter-v${REDIS_EXPORTER_VERSION}.linux-$TARGETARCH.tar.gz && \
+    mv redis_exporter-v${REDIS_EXPORTER_VERSION}.linux-$TARGETARCH redis_exporter
 
 FROM scratch
 

diff --git a/Dockerfile.sentinel b/Dockerfile.sentinel
@@ -12,12 +12,12 @@ ARG REDIS_SENTINEL_VERSION="stable"
 
 RUN apk add --no-cache su-exec tzdata make curl build-base linux-headers bash openssl-dev
 
-RUN curl -fL -Lo /tmp/redis-${REDIS_SENTINEL_VERSION}.tar.gz ${REDIS_DOWNLOAD_URL}/redis-${REDIS_SENTINEL_VERSION}.tar.gz && \
-    cd /tmp && \
+WORKDIR /tmp
+
+RUN curl -fL -Lo redis-${REDIS_SENTINEL_VERSION}.tar.gz ${REDIS_DOWNLOAD_URL}/redis-${REDIS_SENTINEL_VERSION}.tar.gz && \
     tar xvzf redis-${REDIS_SENTINEL_VERSION}.tar.gz && \
-    cd redis-${REDIS_SENTINEL_VERSION} && \
-    make && \
-    make install BUILD_TLS=yes
+    make -C redis-${REDIS_SENTINEL_VERSION} && \
+    make -C redis-${REDIS_SENTINEL_VERSION} install BUILD_TLS=yes
 
 FROM alpine:3.15
 

diff --git a/hadolint.yaml b/hadolint.yaml
@@ -0,0 +1,3 @@
+ignored:
+  - DL3007
+  - DL3018