dw/FFmpeg-Builds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix image names

Browse source
This commit is contained in:
BtbN 2020-09-03 02:54:36 +02:00
parent cd6d7b2979
commit b5eeea84a4
4 changed files with 9 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

21
.github/workflows/build.yml vendored
View file

@ -15,12 +15,9 @@ jobs:
username: ${{ github.actor }} username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }} password: ${{ secrets.GITHUB_TOKEN }}
registry: docker.pkg.github.com registry: docker.pkg.github.com
build_args: BUILDKIT_INLINE_CACHE=1 repository: btbn/ffmpeg-build/builder
repository: btbn/ffmpeg-build/base tags: base
cache_froms: btbn/ffmpeg-build/base:latest
tags: latest
path: base path: base
always_pull: true
build_target_bases: build_target_bases:
name: Build target base images name: Build target base images
needs: build_base needs: build_base
@ -37,12 +34,9 @@ jobs:
username: ${{ github.actor }} username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }} password: ${{ secrets.GITHUB_TOKEN }}
registry: docker.pkg.github.com registry: docker.pkg.github.com
build_args: BUILDKIT_INLINE_CACHE=1 repository: btbn/ffmpeg-build/builder
repository: btbn/ffmpeg-build/base-${{ matrix.target }} tags: base-${{ matrix.target }}
cache_froms: btbn/ffmpeg-build/base-${{ matrix.target }}:latest
tags: latest
path: base-${{ matrix.target }} path: base-${{ matrix.target }}
always_pull: true
build_targets: build_targets:
name: Build target images name: Build target images
needs: build_target_bases needs: build_target_bases
@ -62,8 +56,5 @@ jobs:
username: ${{ github.actor }} username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }} password: ${{ secrets.GITHUB_TOKEN }}
registry: docker.pkg.github.com registry: docker.pkg.github.com
build_args: BUILDKIT_INLINE_CACHE=1 repository: btbn/ffmpeg-build/builder
repository: btbn/ffmpeg-build/${{ matrix.target }}-${{ matrix.variant }} tags: ${{ matrix.target }}-${{ matrix.variant }}
cache_froms: btbn/ffmpeg-build/${{ matrix.target }}-${{ matrix.variant }}:latest
tags: latest
always_pull: true

2
base-win64/Dockerfile
View file

@ -1,4 +1,4 @@
FROM btbn/ffmpeg-builds/base:latest FROM docker.pkg.github.com/btbn/ffmpeg-builds/builder:base
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive

2
generate.sh
View file

@ -10,7 +10,7 @@ to_df() {
echo >> Dockerfile echo >> Dockerfile
} }
to_df "FROM $REPO/base-$TARGET:latest" to_df "FROM $REPO/builder:base-$TARGET"
to_df "ENV TARGET $TARGET" to_df "ENV TARGET $TARGET"
to_df "ENV VARIANT $VARIANT" to_df "ENV VARIANT $VARIANT"
to_df "ENV REPO $REPO" to_df "ENV REPO $REPO"

2
util/vars.sh
View file

@ -7,7 +7,7 @@ fi
TARGET="$1" TARGET="$1"
VARIANT="${2:-gpl}" VARIANT="${2:-gpl}"
REPO="${GITHUB_REPOSITORY:-btbn/ffmpeg-builds}" REPO="docker.pkg.github.com/${GITHUB_REPOSITORY:-btbn/ffmpeg-builds}"
REPO="${REPO,,}" REPO="${REPO,,}"
IMAGE="$REPO/$TARGET-$VARIANT:latest" IMAGE="$REPO/$TARGET-$VARIANT:latest"