Skip to content

Commit e3f8087

Browse files
committed
test3
Signed-off-by: ZePan110 <ze.pan@intel.com>
1 parent 21a8aa6 commit e3f8087

3 files changed

Lines changed: 21 additions & 7 deletions

File tree

.github/workflows/pr-image-size.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ jobs:
3434
- name: Get changed Dockerfiles
3535
id: changed-dockerfiles
3636
run: |
37-
git fetch origin ${{ github.base_ref }}
3837
merged_commit=$(git log -1 --format='%H')
3938
files=$(git diff --name-status --diff-filter=ARM ${{ github.event.pull_request.base.sha }} ${merged_commit} | awk '{print $2}' | grep -E 'Dockerfile$' || true)
4039
echo "files<<EOF" >> $GITHUB_OUTPUT
@@ -55,18 +54,25 @@ jobs:
5554
image_pr="pr-image-size-pr:$(echo $dir | tr '/' '-')"
5655
cd $dir
5756
echo "Building base image for $dockerfile"
58-
git checkout origin/${{ github.base_ref }}
57+
echo "Base: ${{ github.event.pull_request.base.sha }}"
58+
git checkout ${{ github.event.pull_request.base.sha }}
59+
echo "::group::Build image_base"
5960
docker build -f "$file" -t "$image_base" --no-cache .
61+
echo "::endgroup::"
6062
cat $file
6163
size_base=$(docker image inspect "$image_base" | jq '.[0].Size / (1024 * 1024) | round')
6264
6365
echo "Building PR image for $dockerfile"
6466
git checkout $merged_commit
67+
echo "PR: $merged_commit"
68+
echo "::group::Build image_pr"
6569
docker build -f "$file" -t "$image_pr" --no-cache .
70+
echo "::endgroup::"
6671
cat $file
6772
size_pr=$(docker image inspect "$image_pr" | jq '.[0].Size / (1024 * 1024) | round')
6873
6974
diff=$((size_pr - size_base))
70-
echo "::notice file=$dockerfile::Image size change: $size_base -> $size_pr MB}' (diff: $diff MB)"
75+
echo "::warning::Image size change: $size_base -> $size_pr MB}' (diff: $diff MB)"
76+
echo "File $dockerfile resulted in a change in the image size from $size_base -> $size_pr MB" >> GITHUB_STEP_SUMMARY
7177
docker rmi "$image_base" "$image_pr"
7278
done <<< "${{ steps.changed-dockerfiles.outputs.files }}"

MultimodalQnA/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44
ARG IMAGE_REPO=opea
55
ARG BASE_TAG=latest
66
FROM $IMAGE_REPO/comps-base:$BASE_TAG
7-
7+
USER root
8+
# FFmpeg needed for media processing
9+
RUN apt-get update && \
10+
apt-get install -y --no-install-recommends ffmpeg && \
11+
apt-get clean && rm -rf /var/lib/apt/lists/*
12+
USER user
813
COPY ./multimodalqna.py $HOME/multimodalqna.py
914

1015
ENTRYPOINT ["python", "multimodalqna.py"]

SearchQnA/Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44
ARG IMAGE_REPO=opea
55
ARG BASE_TAG=latest
66
FROM $IMAGE_REPO/comps-base:$BASE_TAG
7-
RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
8-
git
9-
RUN git clone https://github.com/opea-project/GenAIExamples
7+
USER root
8+
# FFmpeg needed for media processing
9+
RUN apt-get update && \
10+
apt-get install -y --no-install-recommends ffmpeg && \
11+
apt-get clean && rm -rf /var/lib/apt/lists/*
12+
USER user
1013
COPY ./searchqna.py $HOME/searchqna.py
1114

1215
ENTRYPOINT ["python", "searchqna.py"]

0 commit comments

Comments
 (0)