Rebuild the ubuntu20.

ossrs · Nov 21, 2023 · 817ae6c · 817ae6c
1 parent 689b90a
commit 817ae6c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/Dockerfile.base b/Dockerfile.base
@@ -12,7 +12,7 @@ ARG JOBS=2
 RUN echo "BUILDPLATFORM: $BUILDPLATFORM, TARGETPLATFORM: $TARGETPLATFORM, JOBS: $JOBS"
 
 # https://serverfault.com/questions/949991/how-to-install-tzdata-on-a-ubuntu-docker-image
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 
 # Update the mirror from aliyun, @see https://segmentfault.com/a/1190000022619136
 #ADD sources.list /etc/apt/sources.list
@@ -24,11 +24,11 @@ RUN apt-get update && \
         liblzma-dev libzip-dev libbz2-dev tcl
 
 # Libs path for app which depends on ssl, such as libsrt or cmake.
-ENV PKG_CONFIG_PATH $PKG_CONFIG_PATH:/usr/local/ssl/lib/pkgconfig
+ENV PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/ssl/lib/pkgconfig
 
 # Libs path for FFmpeg(depends on serval libs), or it fail with:
 #       ERROR: speex not found using pkg-config
-ENV PKG_CONFIG_PATH $PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig
+ENV PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig
 
 # To use if in RUN, see https://github.com/moby/moby/issues/7281#issuecomment-389440503
 # Note that only exists issue like "/bin/sh: 1: [[: not found" for Ubuntu20, no such problem in CentOS7.

diff --git a/Dockerfile.base2 b/Dockerfile.base2
@@ -12,7 +12,7 @@ ARG JOBS=2
 RUN echo "BUILDPLATFORM: $BUILDPLATFORM, TARGETPLATFORM: $TARGETPLATFORM, JOBS: $JOBS"
 
 # https://serverfault.com/questions/949991/how-to-install-tzdata-on-a-ubuntu-docker-image
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 
 # Update the mirror from aliyun, @see https://segmentfault.com/a/1190000022619136
 #ADD sources.list /etc/apt/sources.list
@@ -24,11 +24,11 @@ RUN apt-get update && \
         liblzma-dev libzip-dev libbz2-dev tcl
 
 # Libs path for app which depends on ssl, such as libsrt.
-ENV PKG_CONFIG_PATH $PKG_CONFIG_PATH:/usr/local/ssl/lib/pkgconfig
+ENV PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/ssl/lib/pkgconfig
 
 # Libs path for FFmpeg(depends on serval libs), or it fail with:
 #       ERROR: speex not found using pkg-config
-ENV PKG_CONFIG_PATH $PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig
+ENV PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig
 
 # To use if in RUN, see https://github.com/moby/moby/issues/7281#issuecomment-389440503
 # Note that only exists issue like "/bin/sh: 1: [[: not found" for Ubuntu20, no such problem in CentOS7.

diff --git a/Dockerfile.base3 b/Dockerfile.base3
@@ -64,28 +64,28 @@ RUN if [[ $TARGETPLATFORM != 'linux/arm/v7' ]]; then \
         cmake -DENABLE_SHARED=OFF ../../source && make -j${JOBS} && make install; \
     fi
 
-# Cost: xs
+# Cost: 204s
 ADD libpng-1.6.40.tar.gz /tmp
 RUN cd /tmp/libpng-1.6.40 && ./configure --disable-shared --enable-static && make -j${JOBS} && make install
 
-# Cost: xs
+# Cost: 128s
 ADD fribidi-1.0.13.tar.bz2 /tmp
 RUN cd /tmp/fribidi-1.0.13 && ./configure --disable-shared --enable-static && make -j${JOBS} && make install
 
-# Cost: xs
+# Cost: 2167s
 ADD harfbuzz-8.3.0.tar.bz2 /tmp
 RUN cd /tmp/harfbuzz-8.3.0 && ./configure --disable-shared --enable-static && make -j${JOBS} && make install
 
-# Cost: xs
+# Cost: 259s
 # Depends on libpng.
 ADD freetype-2.13.2.tar.gz /tmp
 RUN cd /tmp/freetype-2.13.2 && ./configure --disable-shared --enable-static && make -j${JOBS} && make install
 
-# Cost: xs
+# Cost: 174s
 ADD expat-2.5.0.tar.bz2 /tmp
 RUN cd /tmp/expat-2.5.0 && ./configure --disable-shared --enable-static && make -j${JOBS} && make install
 
-# Cost: xs
+# Cost: 399s
 # Depends on gperf, expat, freetype.
 ADD fontconfig-2.14.2.tar.bz2 /tmp
 RUN cd /tmp/fontconfig-2.14.2 && ./configure --disable-shared --enable-static && make -j${JOBS} && make install