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

Move base images to subdir

Browse source
This commit is contained in:
BtbN 2020-09-03 16:33:29 +02:00
parent 6ad0e85361
commit f4ed3a8008
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@ jobs:
cache_froms: btbn/ffmpeg-builder:base cache_froms: btbn/ffmpeg-builder:base
repository: btbn/ffmpeg-builder repository: btbn/ffmpeg-builder
tags: base tags: base
path: base path: images/base
build_target_bases: build_target_bases:
name: Build target base image name: Build target base image
needs: build_base needs: build_base
@ -42,7 +42,7 @@ jobs:
cache_froms: btbn/ffmpeg-builder:base-${{ matrix.target }} cache_froms: btbn/ffmpeg-builder:base-${{ matrix.target }}
repository: btbn/ffmpeg-builder repository: btbn/ffmpeg-builder
tags: base-${{ matrix.target }} tags: base-${{ matrix.target }}
path: base-${{ matrix.target }} path: images/base-${{ matrix.target }}
build_targets: build_targets:
name: Build target-variant image name: Build target-variant image
needs: build_target_bases needs: build_target_bases
@ -67,3 +67,11 @@ jobs:
cache_froms: btbn/ffmpeg-builder:${{ matrix.target }}-${{ matrix.variant }} cache_froms: btbn/ffmpeg-builder:${{ matrix.target }}-${{ matrix.variant }}
repository: btbn/ffmpeg-builder repository: btbn/ffmpeg-builder
tags: ${{ matrix.target }}-${{ matrix.variant }} tags: ${{ matrix.target }}-${{ matrix.variant }}
build_ffmpeg:
name: Build ffmpeg
needs: build_targets
runs-on: ubuntu-latest
strategy:
matrix:
target: [win64]
variant: [gpl,lgpl]

0
base-win64/Dockerfile → images/base-win64/Dockerfile
View file

0
base/Dockerfile → images/base/Dockerfile
View file