Skip to content

Commit 17247da

Browse files
AhmedYasserrrAhmedYasserrr
and
AhmedYasserrr
authored
[IMPROVEMENT] Refactor and optimize Dockerfile (#1696)
* [FIX] Corrected bitness check for 64-bit systems * Improve Dockerfile: cleanup, parallel build, and remove redundancies - Replaced cd with WORKDIR for clarity and Docker best practices. - Removed unused LIB_CLANG_PATH export, as it only affected a single build layer; the library is automatically detected during build. - Parallelized the GPAC build using make -j$(nproc). - Removed redundant CMD instruction, as ENTRYPOINT already defines the container's execution command. * [DOCS] Update CHANGES.TXT for Dockerfile improvements --------- Co-authored-by: AhmedYasserrr <[email protected]>
1 parent 888ffa4 commit 17247da

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

docker/dockerfile

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,18 @@ FROM base as builder
44

55
RUN apk add --no-cache --update git curl gcc cmake glew glfw \
66
tesseract-ocr-dev leptonica-dev clang-dev llvm-dev make pkgconfig \
7-
zlib-dev libpng-dev libjpeg-turbo-dev openssl-dev freetype-dev libxml2-dev
8-
9-
RUN cd && git clone https://github.com/gpac/gpac
10-
WORKDIR root/gpac/
11-
RUN ./configure && make && make install-lib && cd && rm -rf /root/gpac
7+
zlib-dev libpng-dev libjpeg-turbo-dev openssl-dev freetype-dev libxml2-dev bash cargo
128

139
WORKDIR /root
10+
RUN git clone https://github.com/gpac/gpac
11+
WORKDIR /root/gpac/
12+
RUN ./configure && make -j$(nproc) && make install-lib
13+
WORKDIR /root
14+
RUN rm -rf /root/gpac
15+
1416
RUN git clone https://github.com/CCExtractor/ccextractor.git
15-
RUN apk add bash cargo
16-
RUN export LIB_CLANG_PATH=$(find / -name 'libclang*.so*' 2>/dev/null | grep -v 'No such file' | head -n 1 | xargs dirname)
17-
RUN cd /root/ccextractor/linux && ./pre-build.sh && ./build
17+
WORKDIR /root/ccextractor/linux
18+
RUN ./pre-build.sh && ./build
1819

1920
RUN cp /root/ccextractor/linux/ccextractor /ccextractor && rm -rf ~/ccextractor
2021

@@ -42,7 +43,4 @@ COPY --from=builder /usr/lib/libsharpyuv.so.0 /usr/lib/
4243

4344
COPY --from=builder /ccextractor /
4445

45-
ENTRYPOINT [ "/ccextractor" ]
46-
47-
CMD [ "/ccextractor" ]
48-
46+
ENTRYPOINT [ "/ccextractor" ]

docs/CHANGES.TXT

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
1.0 (to be released)
22
-----------------
3+
- IMPROVEMENT: Refactor and optimize Dockerfile
34
- Fix: Improved handling of IETF language tags in Matroska files (#1665)
45
- New: Create unit test for rust code (#1615)
56
- Breaking: Major argument flags revamp for CCExtractor (#1564 & #1619)

0 commit comments

Comments
 (0)