Skip to content

Commit 44e54a8

Browse files
committed
docker; CI: undo lock ffmpeg at 7.1 stuff
- revert commits: 1. ba3a039 2. 7a80056
1 parent 264592b commit 44e54a8

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

.github/workflows/Build-Push-Containers.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ on:
66
- master
77
tags:
88
- '*'
9-
# schedule:
10-
# - cron: '0 0 * * MON' # Every Monday at 00:00 (UTC) .
9+
schedule:
10+
- cron: '0 0 * * MON' # Every Monday at 00:00 (UTC) .
1111

1212
env:
1313
IMAGE_NAME: ctbcap

Dockerfile

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -168,17 +168,15 @@ EOT
168168
WORKDIR /ffmpeg_source
169169

170170
RUN <<EOT
171-
# Get newest version of FFmpeg.
172-
# FFMPEG_TARBALL="$( \
173-
# curl -s -L -k --connect-timeout 5 --retry 3 \
174-
# "https://ffmpeg.org/releases/" \
175-
# | grep -oE 'ffmpeg-[0-9]+.*.tar.xz' \
176-
# | sed 's|\.tar.xz.*||' \
177-
# | sort -V \
178-
# | tail -n 1 \
179-
# ).tar.xz"
180-
181-
FFMPEG_TARBALL="ffmpeg-7.1.tar.xz"
171+
# Get newest version tarball of FFmpeg.
172+
FFMPEG_TARBALL="$( \
173+
curl -s -L -k --connect-timeout 5 --retry 3 \
174+
"https://ffmpeg.org/releases/" \
175+
| grep -oE 'ffmpeg-[0-9]+.*.tar.xz' \
176+
| sed 's|\.tar.xz.*||' \
177+
| sort -V \
178+
| tail -n 1 \
179+
).tar.xz"
182180

183181
curl -L -k --connect-timeout 5 --retry 3 \
184182
"https://ffmpeg.org/releases/${FFMPEG_TARBALL}" \

0 commit comments

Comments
 (0)