Skip to content

Commit d1e40ef

Browse files
upd(ffmpeg): use cached ffmpeg build if unable to connect
1 parent 3ea72d4 commit d1e40ef

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

images/chromium-headful/Dockerfile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,16 @@ RUN --mount=type=cache,target=/tmp/cache/ffmpeg,id=ffmpeg \
116116
set -eux; \
117117
URL="https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz"; \
118118
echo "Downloading FFmpeg MD5 checksum"; \
119-
curl -fsSL "${URL}.md5" -o /tmp/cache/ffmpeg/ffmpeg.tar.xz.md5; \
119+
if ! curl --connect-timeout 10 -fsSL "${URL}.md5" -o /tmp/cache/ffmpeg/ffmpeg.tar.xz.md5; then \
120+
echo "Failed to connect to ffmpeg static build provider for MD5 checksum."; \
121+
echo "Checking for cached version to use."; \
122+
if [ ! -f /tmp/cache/ffmpeg/ffmpeg.tar.xz.md5 ]; then \
123+
echo "Unable to locate cached MD5 checksum. Exiting."; \
124+
exit 1; \
125+
else \
126+
echo "Found cached MD5 checksum."; \
127+
fi; \
128+
fi; \
120129
sed -i -e 's/ .*$/ \/tmp\/cache\/ffmpeg\/ffmpeg.tar.xz/' /tmp/cache/ffmpeg/ffmpeg.tar.xz.md5; \
121130
echo "Checking cache for FFmpeg archive and validating MD5 checksum"; \
122131
if md5sum --check /tmp/cache/ffmpeg/ffmpeg.tar.xz.md5; then \

images/chromium-headless/image/Dockerfile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,16 @@ RUN --mount=type=cache,target=/tmp/cache/ffmpeg,id=ffmpeg \
7171
set -eux; \
7272
URL="https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz"; \
7373
echo "Downloading FFmpeg MD5 checksum"; \
74-
curl -fsSL "${URL}.md5" -o /tmp/cache/ffmpeg/ffmpeg.tar.xz.md5; \
74+
if ! curl --connect-timeout 10 -fsSL "${URL}.md5" -o /tmp/cache/ffmpeg/ffmpeg.tar.xz.md5; then \
75+
echo "Failed to connect to ffmpeg static build provider for MD5 checksum."; \
76+
echo "Checking for cached version to use."; \
77+
if [ ! -f /tmp/cache/ffmpeg/ffmpeg.tar.xz.md5 ]; then \
78+
echo "Unable to locate cached MD5 checksum. Exiting."; \
79+
exit 1; \
80+
else \
81+
echo "Found cached MD5 checksum."; \
82+
fi; \
83+
fi; \
7584
sed -i -e 's/ .*$/ \/tmp\/cache\/ffmpeg\/ffmpeg.tar.xz/' /tmp/cache/ffmpeg/ffmpeg.tar.xz.md5; \
7685
echo "Checking cache for FFmpeg archive and validating MD5 checksum"; \
7786
if md5sum --check /tmp/cache/ffmpeg/ffmpeg.tar.xz.md5; then \

0 commit comments

Comments
 (0)