Fix code scan warning (#473)

Signed-off-by: zepan <ze.pan@intel.com>
opea-project · Aug 2, 2024 · ac89855 · ac89855
1 parent c71bc68
commit ac89855
Show file tree

Hide file tree

Showing 17 changed files with 61 additions and 48 deletions.
diff --git a/.github/workflows/docker/code-scan.dockerfile b/.github/workflows/docker/code-scan.dockerfile
@@ -4,7 +4,7 @@
 ARG UBUNTU_VER=22.04
 FROM ubuntu:${UBUNTU_VER} as devel
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
     aspell \

diff --git a/.github/workflows/scripts/codeScan/hadolint.sh b/.github/workflows/scripts/codeScan/hadolint.sh
@@ -6,12 +6,16 @@
 source /GenAIExamples/.github/workflows/scripts/change_color
 log_dir=/GenAIExamples/.github/workflows/scripts/codeScan
 
-find . -type f \( -name "Dockerfile*" \) -print -exec hadolint --ignore DL3006 --ignore DL3007 --ignore DL3008 {} \; 2>&1 | tee ${log_dir}/hadolint.log
+find . -type f \( -name "Dockerfile*" \) -print -exec hadolint --ignore DL3006 --ignore DL3007 --ignore DL3008 --ignore DL3013 {} \; 2>&1 | tee ${log_dir}/hadolint.log
 
 if [[ $(grep -c "error" ${log_dir}/hadolint.log) != 0 ]]; then
     $BOLD_RED && echo "Error!! Please Click on the artifact button to download and check error details." && $RESET
     exit 1
 fi
 
+if [[ $(grep -c "warning" ${log_dir}/hadolint.log) != 0 ]]; then
+    $BOLD_RED && echo "Warning!! Please Click on the artifact button to download and check warning details." && $RESET
+    exit 1
+fi
 $BOLD_PURPLE && echo "Congratulations, Hadolint check passed!" && $LIGHT_PURPLE && echo " You can click on the artifact button to see the log details." && $RESET
 exit 0
diff --git a/AudioQnA/deprecated/docker/Dockerfile_asr b/AudioQnA/deprecated/docker/Dockerfile_asr
@@ -1,13 +1,13 @@
 FROM python:3.11-slim
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 # Install system dependencies
 RUN apt-get update \
     && apt-get install -y ffmpeg
 
 COPY ./asr /asr
-RUN pip install -r /asr/requirements.txt
+RUN pip install --no-cache-dir -r /asr/requirements.txt
 
 WORKDIR /asr
 

diff --git a/AudioQnA/deprecated/docker/Dockerfile_tts b/AudioQnA/deprecated/docker/Dockerfile_tts
@@ -1,6 +1,6 @@
 FROM python:3.9-slim
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 ENV PYTHONPATH=/home/user:/GPT-SoVITS/GPT_SoVITS
 
 # Install system dependencies
@@ -16,7 +16,7 @@ ENV OMP_NUM_THREADS=56
 
 RUN git clone https://github.com/RVC-Boss/GPT-SoVITS.git /GPT-SoVITS -b main
 
-RUN pip install -r /GPT-SoVITS/requirements.txt
+RUN pip install --no-cache-dir -r /GPT-SoVITS/requirements.txt
 
 COPY ./tts/tts_server.py /GPT-SoVITS/
 COPY ./tts/config.py /GPT-SoVITS/

diff --git a/AudioQnA/deprecated/langchain/docker/qna-app/Dockerfile b/AudioQnA/deprecated/langchain/docker/qna-app/Dockerfile
@@ -4,7 +4,7 @@
 
 FROM python:3.11-slim
 
-RUN pip install poetry==1.6.1
+RUN pip install --no-cache-dir poetry==1.6.1
 
 RUN poetry config virtualenvs.create false
 
@@ -22,4 +22,4 @@ RUN poetry install --no-interaction --no-ansi
 
 EXPOSE 8080
 
-CMD exec uvicorn app.server:app --host 0.0.0.0 --port 8080
+CMD ["uvicorn", "app.server:app", "--host", "0.0.0.0", "--port", "8080"]
diff --git a/AudioQnA/docker/Dockerfile b/AudioQnA/docker/Dockerfile
@@ -15,11 +15,12 @@ RUN useradd -m -s /bin/bash user && \
     mkdir -p /home/user && \
     chown -R user /home/user/
 
-RUN cd /home/user/ && \
-    git clone https://github.com/opea-project/GenAIComps.git
+WORKDIR /home/user/
+RUN git clone https://github.com/opea-project/GenAIComps.git
 
-RUN cd /home/user/GenAIComps && pip install --no-cache-dir --upgrade pip && \
-    pip install -r /home/user/GenAIComps/requirements.txt
+WORKDIR /home/user/GenAIComps
+RUN pip install --no-cache-dir --upgrade pip && \
+    pip install --no-cache-dir -r /home/user/GenAIComps/requirements.txt
 
 COPY ./audioqna.py /home/user/audioqna.py
 

diff --git a/ChatQnA/deprecated/langchain/docker/qna-app/Dockerfile b/ChatQnA/deprecated/langchain/docker/qna-app/Dockerfile
@@ -22,4 +22,4 @@ RUN poetry install --no-interaction --no-ansi
 
 EXPOSE 8080
 
-CMD exec uvicorn app.server:app --host 0.0.0.0 --port 8080
+CMD ["uvicorn", "app.server:app", "--host", "0.0.0.0", "--port", "8080"]
diff --git a/ChatQnA/docker/Dockerfile b/ChatQnA/docker/Dockerfile
@@ -15,11 +15,12 @@ RUN useradd -m -s /bin/bash user && \
     mkdir -p /home/user && \
     chown -R user /home/user/
 
-RUN cd /home/user/ && \
-    git clone https://github.com/opea-project/GenAIComps.git
+WORKDIR /home/user/
+RUN git clone https://github.com/opea-project/GenAIComps.git
 
-RUN cd /home/user/GenAIComps && pip install --no-cache-dir --upgrade pip && \
-    pip install -r /home/user/GenAIComps/requirements.txt
+WORKDIR /home/user/GenAIComps
+RUN pip install --no-cache-dir --upgrade pip && \
+    pip install --no-cache-dir -r /home/user/GenAIComps/requirements.txt
 
 COPY ./chatqna.py /home/user/chatqna.py
 

diff --git a/ChatQnA/docker/Dockerfile_guardrails b/ChatQnA/docker/Dockerfile_guardrails
@@ -15,11 +15,12 @@ RUN useradd -m -s /bin/bash user && \
     mkdir -p /home/user && \
     chown -R user /home/user/
 
-RUN cd /home/user/ && \
-    git clone https://github.com/opea-project/GenAIComps.git
+WORKDIR /home/user/
+RUN git clone https://github.com/opea-project/GenAIComps.git
 
-RUN cd /home/user/GenAIComps && pip install --no-cache-dir --upgrade pip && \
-    pip install -r /home/user/GenAIComps/requirements.txt
+WORKDIR /home/user/GenAIComps
+RUN pip install --no-cache-dir --upgrade pip && \
+    pip install --no-cache-dir -r /home/user/GenAIComps/requirements.txt
 
 COPY ./chatqna_guardrails.py /home/user/chatqna_guardrails.py
 

diff --git a/CodeGen/docker/Dockerfile b/CodeGen/docker/Dockerfile
@@ -5,7 +5,7 @@
 
 FROM python:3.11-slim
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 RUN apt-get update -y && apt-get install -y --no-install-recommends --fix-missing \
     libgl1-mesa-glx \
@@ -17,11 +17,12 @@ RUN useradd -m -s /bin/bash user && \
     mkdir -p /home/user && \
     chown -R user /home/user/
 
-RUN cd /home/user/ && \
-    git clone https://github.com/opea-project/GenAIComps.git
+WORKDIR /home/user/
+RUN git clone https://github.com/opea-project/GenAIComps.git
 
-RUN cd /home/user/GenAIComps && pip install --no-cache-dir --upgrade pip && \
-    pip install -r /home/user/GenAIComps/requirements.txt
+WORKDIR /home/user/GenAIComps
+RUN pip install --no-cache-dir --upgrade pip && \
+    pip install --no-cache-dir -r /home/user/GenAIComps/requirements.txt
 
 COPY ./codegen.py /home/user/codegen.py
 

diff --git a/CodeTrans/docker/Dockerfile b/CodeTrans/docker/Dockerfile
@@ -15,11 +15,12 @@ RUN useradd -m -s /bin/bash user && \
     mkdir -p /home/user && \
     chown -R user /home/user/
 
-RUN cd /home/user/ && \
-    git clone https://github.com/opea-project/GenAIComps.git
+WORKDIR /home/user/
+RUN git clone https://github.com/opea-project/GenAIComps.git
 
-RUN cd /home/user/GenAIComps && pip install --no-cache-dir --upgrade pip && \
-    pip install -r /home/user/GenAIComps/requirements.txt
+WORKDIR /home/user/GenAIComps
+RUN pip install --no-cache-dir --upgrade pip && \
+    pip install --no-cache-dir -r /home/user/GenAIComps/requirements.txt
 
 COPY ./code_translation.py /home/user/code_translation.py
 

diff --git a/DocSum/deprecated/langchain/docker/summarize-app/Dockerfile b/DocSum/deprecated/langchain/docker/summarize-app/Dockerfile
@@ -23,4 +23,4 @@ RUN poetry install --no-interaction --no-ansi
 
 EXPOSE 8080
 
-CMD exec uvicorn app.server:app --host 0.0.0.0 --port 8080
+CMD ["uvicorn", "app.server:app", "--host", "0.0.0.0", "--port", "8080"]
diff --git a/DocSum/docker/Dockerfile b/DocSum/docker/Dockerfile
@@ -14,11 +14,12 @@ RUN useradd -m -s /bin/bash user && \
     mkdir -p /home/user && \
     chown -R user /home/user/
 
-RUN cd /home/user/ && \
-    git clone https://github.com/opea-project/GenAIComps.git
+WORKDIR /home/user
+RUN git clone https://github.com/opea-project/GenAIComps.git
 
-RUN cd /home/user/GenAIComps && pip install --no-cache-dir --upgrade pip && \
-    pip install -r /home/user/GenAIComps/requirements.txt
+WORKDIR /home/user/GenAIComps
+RUN pip install --no-cache-dir --upgrade pip && \
+    pip install --no-cache-dir -r /home/user/GenAIComps/requirements.txt
 
 COPY ./docsum.py /home/user/docsum.py
 

diff --git a/FaqGen/docker/Dockerfile b/FaqGen/docker/Dockerfile
@@ -15,11 +15,12 @@ RUN useradd -m -s /bin/bash user && \
     mkdir -p /home/user && \
     chown -R user /home/user/
 
-RUN cd /home/user/ && \
-    git clone https://github.com/opea-project/GenAIComps.git
+WORKDIR /home/user/
+RUN git clone https://github.com/opea-project/GenAIComps.git
 
-RUN cd /home/user/GenAIComps && pip install --no-cache-dir --upgrade pip && \
-    pip install -r /home/user/GenAIComps/requirements.txt
+WORKDIR /home/user/GenAIComps
+RUN pip install --no-cache-dir --upgrade pip && \
+    pip install --no-cache-dir -r /home/user/GenAIComps/requirements.txt
 
 COPY ./faqgen.py /home/user/faqgen.py
 

diff --git a/SearchQnA/docker/Dockerfile b/SearchQnA/docker/Dockerfile
@@ -15,11 +15,12 @@ RUN useradd -m -s /bin/bash user && \
     mkdir -p /home/user && \
     chown -R user /home/user/
 
-RUN cd /home/user/ && \
-    git clone https://github.com/opea-project/GenAIComps.git
+WORKDIR /home/user/
+RUN git clone https://github.com/opea-project/GenAIComps.git
 
-RUN cd /home/user/GenAIComps && pip install --no-cache-dir --upgrade pip && \
-    pip install -r /home/user/GenAIComps/requirements.txt
+WORKDIR /home/user/GenAIComps
+RUN pip install --no-cache-dir --upgrade pip && \
+    pip install --no-cache-dir -r /home/user/GenAIComps/requirements.txt
 
 COPY ./searchqna.py /home/user/searchqna.py
 

diff --git a/Translation/deprecated/serving/tgi_gaudi/Dockerfile b/Translation/deprecated/serving/tgi_gaudi/Dockerfile
@@ -3,4 +3,4 @@
 
 FROM ghcr.io/huggingface/tgi-gaudi:1.2.1
 
-RUN pip install peft==0.6.2
+RUN pip install --no-cache-dir peft==0.6.2
diff --git a/Translation/docker/Dockerfile b/Translation/docker/Dockerfile
@@ -25,11 +25,12 @@ RUN useradd -m -s /bin/bash user && \
     mkdir -p /home/user && \
     chown -R user /home/user/
 
-RUN cd /home/user/ && \
-    git clone https://github.com/opea-project/GenAIComps.git
+WORKDIR /home/user/
+RUN git clone https://github.com/opea-project/GenAIComps.git
 
-RUN cd /home/user/GenAIComps && pip install --no-cache-dir --upgrade pip && \
-    pip install -r /home/user/GenAIComps/requirements.txt
+WORKDIR /home/user/GenAIComps
+RUN pip install --no-cache-dir --upgrade pip && \
+    pip install --no-cache-dir -r /home/user/GenAIComps/requirements.txt
 
 COPY ./translation.py /home/user/translation.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,4 +22,4 @@ RUN poetry install --no-interaction --no-ansi

		EXPOSE 8080

		CMD exec uvicorn app.server:app --host 0.0.0.0 --port 8080
		CMD ["uvicorn", "app.server:app", "--host", "0.0.0.0", "--port", "8080"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,4 +23,4 @@ RUN poetry install --no-interaction --no-ansi

		EXPOSE 8080

		CMD exec uvicorn app.server:app --host 0.0.0.0 --port 8080
		CMD ["uvicorn", "app.server:app", "--host", "0.0.0.0", "--port", "8080"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,4 @@

		FROM ghcr.io/huggingface/tgi-gaudi:1.2.1

		RUN pip install peft==0.6.2
		RUN pip install --no-cache-dir peft==0.6.2