use latest release of svtav1 instead of master branch

Author: madebyTimo

.github/workflows/build-release.yaml

@@ -32,7 +32,8 @@ jobs:
                   if (ls /media/saved-cache/*.tar.zst); then
                       docker run --pull always --rm \
                           --volume "/media/saved-cache:/media/saved-cache" \
-                          --volume "docker-encoder-build-cache:/media/build-cache" \
+                          --volume \
+                          "docker-encoder-build-cache:/media/build-cache" \
                           --workdir /media \
                           madebytimo/scripts \
                           compress.sh --decompress /media/saved-cache/*.tar.zst
@@ -82,7 +83,8 @@ jobs:
               run: |
                   docker run --pull always --rm \
                       --volume "/media/saved-cache:/media/saved-cache" \
-                      --volume "docker-encoder-build-cache:/media/build-cache" \
+                      --volume \
+                      "docker-encoder-build-cache:/media/build-cache" \
                       madebytimo/scripts \
                       compress.sh --fast --output /media/saved-cache/build-cache /media/build-cache
                   sudo chown -R "$(whoami)" /media/saved-cache

.github/workflows/static-code-analysis.yaml

@@ -19,7 +19,8 @@ jobs:
                   if (ls /media/saved-cache/*.tar.zst); then
                       docker run --pull always --rm \
                           --volume "/media/saved-cache:/media/saved-cache" \
-                          --volume "docker-encoder-build-cache:/media/build-cache" \
+                          --volume \
+                          "docker-encoder-build-cache:/media/build-cache" \
                           --workdir /media \
                           madebytimo/scripts \
                           compress.sh --decompress /media/saved-cache/*.tar.zst
@@ -45,7 +46,8 @@ jobs:
               run: |
                   docker run --pull always --rm \
                       --volume "/media/saved-cache:/media/saved-cache" \
-                      --volume "docker-encoder-build-cache:/media/build-cache" \
+                      --volume \
+                      "docker-encoder-build-cache:/media/build-cache" \
                       madebytimo/scripts \
                       compress.sh --fast --output /media/saved-cache/build-cache /media/build-cache
                   sudo chown -R "$(whoami)" /media/saved-cache

Dockerfile

@@ -4,10 +4,14 @@ RUN apt update -qq && apt install -y -qq libass-dev libdav1d-dev libmp3lame-dev
     libva-dev libvdpau-dev libvorbis-dev libvpx-dev libx264-dev libx265-dev texinfo wget && \
     rm -rf /var/lib/apt/lists/*
 
-RUN export FFMPEG_VERSION="$(curl --silent --location https://ffmpeg.org/download.html \
+
+RUN FFMPEG_VERSION="$(curl --silent --location https://ffmpeg.org/download.html \
         | grep --max-count 1 --only-matching 'https://ffmpeg.org/releases/ffmpeg-.*\.tar' \
         | sed 's|^.*ffmpeg-\(.*\)\.tar|\1|')" \
-    && curl --silent --location "https://ffmpeg.org/ffmpeg-devel.asc" \
+    SVTAV1_VERSION="$(download.sh --silent --output - \
+        https://gitlab.com/api/v4/projects/AOMediaCodec%2FSVT-AV1/releases \
+        | sed --null-data --silent 's|^[^{]*{[^{]*"tag_name":[^"]*"\([^"]*\)".*$|\1|p')" \
+    && download.sh --silent --output - "https://ffmpeg.org/ffmpeg-devel.asc" \
     | gpg --yes --dearmor >> signature-public-keys.gpg \
     && download.sh --name ffmpeg.tar.gz \
         "https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz" \
@@ -20,7 +24,8 @@ RUN export FFMPEG_VERSION="$(curl --silent --location https://ffmpeg.org/downloa
     && rm ffmpeg.tar.gz \
     && mv ffmpeg-* ffmpeg \
     && download.sh --name svt-av1.tar.gz \
-        https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/master/SVT-AV1-master.tar.gz \
+        "https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/${SVTAV1_VERSION}/\
+SVT-AV1-${SVTAV1_VERSION}.tar.gz" \
     && compress.sh --decompress svt-av1.tar.gz \
     && rm svt-av1.tar.gz \
     && mv SVT-AV1-* svt-av1

Version.txt

@@ -1 +1 @@
-v1.1.0
+v1.1.1

builder/build.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e
+set -e -o pipefail
 
 SCRIPT_DIR="$(dirname "$(realpath "$0")")"
 

builder/docker.sh

@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
-set -e
+set -e -o pipefail
 
 BUILD_ARGUMENTS=()
-DEPENDENCIES=(docker)
+BUILDER_EXPORT_ARCHIVE="${BUILDER_EXPORT_ARCHIVE:-true}"
+DEPENDENCIES=(docker zstd)
 UPDATE_BASE=false
-PLATFORMS=(amd64 arm64)
+PLATFORMS=(linux/amd64 linux/arm64)
 REGISTRY_USER="madebytimo"
 APPLICATION_NAME="encoder"
 
@@ -14,7 +15,7 @@ for ARGUMENT in "$@"; do
         echo "usage: $(basename "$0") [ARGUMENT]"
         echo "Builds the docker image from the Dockerfile."
         echo "ARGUMENT can be"
-        echo "--platform [amd64|arm64|arm] Build only for specified platform."
+        echo "--platform PLATFORM Build only for specified platform."
         echo "--publish Push the build."
         echo "--update-base Only build if newer base image is available."
         exit
@@ -49,13 +50,15 @@ cd "$PROJECT_DIR"
 mkdir --parents builds
 
 BASE_IMAGE="$(tac Dockerfile | grep --max-count=1 "^FROM" | cut -d" " -f2)"
-docker pull "$BASE_IMAGE"
-BASE_IMAGE_DATE="$(docker image inspect --format="{{ .Created }}" "$BASE_IMAGE" | cut -d "T" -f1)"
+docker pull --quiet "$BASE_IMAGE"
+BASE_IMAGE_DATE="$(docker image inspect --format="{{ .Created }}" "$BASE_IMAGE" \
+    | sed 's|^\([^T ]*\)[T ].*$|\1|')"
 echo "Base image is $BASE_IMAGE from $BASE_IMAGE_DATE"
 IMAGE="${REGISTRY_USER}/${APPLICATION_NAME}"
 if [[ "$UPDATE_BASE" == true ]]; then
     docker pull "$IMAGE"
-    PUSHED_IMAGE_DATE="$(docker image inspect --format="{{ .Created }}" "$IMAGE" | cut -d "T" -f1)"
+    PUSHED_IMAGE_DATE="$(docker image inspect --format="{{ .Created }}" "$IMAGE" \
+        | sed 's|^\([^T ]*\)[T ].*$|\1|')"
     echo "Last pushed image is from $PUSHED_IMAGE_DATE"
     if [[ "$BASE_IMAGE_DATE" < "$PUSHED_IMAGE_DATE" ]]; then
         echo "Used base image is up to date"
@@ -65,9 +68,27 @@ fi
 
 PLATFORMS_STRING="${PLATFORMS[*]}"
 BUILD_ARGUMENTS+=(--platform "${PLATFORMS_STRING// /,}")
-OUTPUT_FILE="builds/${IMAGE//"/"/-}-${VERSION}-oci.tar"
+if [[ "$BUILDER_EXPORT_ARCHIVE" == true ]]; then
+    OUTPUT_FILE="builds/${IMAGE//"/"/-}-${VERSION}-oci.tar"
+    BUILD_ARGUMENTS+=(--output \
+    "type=oci,dest=${OUTPUT_FILE},compression=zstd,compression-level=19,force-compression=true")
+fi
 
-docker buildx build "${BUILD_ARGUMENTS[@]}" --output \
-    "type=oci,dest=${OUTPUT_FILE},compression=zstd,compression-level=19,force-compression=true" \
+docker buildx build "${BUILD_ARGUMENTS[@]}" \
     --tag "${IMAGE}:latest" --tag "${IMAGE}:${VERSION}" \
     --tag "${IMAGE}:${VERSION}-base-${BASE_IMAGE_DATE}" .
+
+if [[ "$BUILDER_EXPORT_ARCHIVE" == true ]]; then
+    docker pull --quiet quay.io/skopeo/stable > /dev/null
+    rm -f builds/.temp-docker-archive.tar
+    for PLATFORM in "${PLATFORMS[@]}"; do
+        docker run --interactive --rm --volume "${PWD}/builds:/builds" \
+            quay.io/skopeo/stable copy --additional-tag "${IMAGE}:latest" --additional-tag \
+            "${IMAGE}:${VERSION}" --additional-tag "${IMAGE}:${VERSION}-base-${BASE_IMAGE_DATE}" \
+            --override-arch "${PLATFORM#*/}" --quiet "oci-archive:${OUTPUT_FILE}:latest" \
+            "docker-archive:builds/.temp-docker-archive.tar"
+        zstd -19 --force --quiet -T0 builds/.temp-docker-archive.tar \
+            -o "${OUTPUT_FILE%oci.tar}${PLATFORM#*/}.tar.zst"
+        rm -f builds/.temp-docker-archive.tar
+    done
+fi