DRAFT update dockerfiles for hadolint standards

ibutsu · May 31, 2024 · 5026462 · 5026462
1 parent 2d1eeea
commit 5026462
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/backend/Containerfile b/backend/Containerfile
@@ -1,7 +1,9 @@
-FROM  registry.access.redhat.com/ubi8/python-38 as base
+FROM  registry.access.redhat.com/ubi8/python-38:latest1 as base
+
 USER 0
-RUN mkdir /ibutsu_venv
-RUN chown -R 1001:0 /ibutsu_venv /srv
+RUN mkdir -p /ibutsu_venv && \
+    chown -R 1001:0 /ibutsu_venv /srv
+
 USER 1001
 WORKDIR  /srv
 RUN python -m venv /ibutsu_venv && \

diff --git a/backend/docker/Dockerfile.backend b/backend/docker/Dockerfile.backend
@@ -1,13 +1,16 @@
-FROM registry.access.redhat.com/ubi8/ubi-minimal
+# hadolint global ignore=DL3014,DL3041
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10
 
 WORKDIR /app
 
 USER 0
 
-RUN microdnf install --nodocs -y --disableplugin=subscription-manager gcc libpq-devel python39 python39-devel
 COPY . /app
-RUN pip3 install --no-cache-dir gunicorn && pip3 install --no-cache-dir -r requirements.txt
-RUN chgrp -R 0 ibutsu_server && chmod -R g+rwX ibutsu_server
+RUN microdnf install --nodocs -y --disableplugin=subscription-manager gcc libpq-devel python39 python39-devel && \
+    microdnf clean all && \
+    pip3 install --no-cache-dir gunicorn && \
+    pip3 install --no-cache-dir -r requirements.txt && \
+    chgrp -R 0 ibutsu_server && chmod -R g+rwX ibutsu_server
 
 USER 1001
 

diff --git a/backend/docker/Dockerfile.flower b/backend/docker/Dockerfile.flower
@@ -1,4 +1,5 @@
-FROM registry.access.redhat.com/ubi8/python-38
+# hadolint global ignore=DL3014,DL3041
+FROM registry.access.redhat.com/ubi8/python-38:latest
 
 # add application sources with correct perms for OCP
 USER 0

diff --git a/backend/docker/Dockerfile.fuzz_testing b/backend/docker/Dockerfile.fuzz_testing
@@ -1,4 +1,5 @@
-FROM python:3.9
+# hadolint global ignore=DL3014,DL3041
+FROM registry.access.redhat.com/ubi8/python-39
 
 RUN apt-get update && \
     apt-get install -y jq && \

diff --git a/backend/docker/Dockerfile.scheduler b/backend/docker/Dockerfile.scheduler
@@ -1,3 +1,4 @@
+# hadolint global ignore=DL3014,DL3041
 FROM registry.access.redhat.com/ubi8/ubi-minimal
 
 WORKDIR /app

diff --git a/backend/docker/Dockerfile.worker b/backend/docker/Dockerfile.worker
@@ -1,3 +1,4 @@
+# hadolint global ignore=DL3014,DL3041
 FROM registry.access.redhat.com/ubi8/ubi-minimal
 
 WORKDIR /app