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

Use Docker Hub...

Browse source
This commit is contained in:
BtbN 2020-09-03 03:13:45 +02:00
parent 04b18a170b
commit a7ade4dc87
5 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,13 +9,14 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Pull latest
run: docker pull btbn/ffmpeg-builder:base || true
- name: Build and push base - name: Build and push base
uses: docker/build-push-action@v1 uses: docker/build-push-action@v1
with: with:
username: BtbN username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.REG_TOKEN }} password: ${{ secrets.DOCKER_TOKEN }}
registry: docker.pkg.github.com repository: btbn/ffmpeg-builder
repository: btbn/ffmpeg-build/builder
tags: base tags: base
path: base path: base
build_target_bases: build_target_bases:
@ -28,13 +29,14 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Pull latest
run: docker pull btbn/ffmpeg-builder:base-${{ matrix.target }} || true
- name: Build and push target base - name: Build and push target base
uses: docker/build-push-action@v1 uses: docker/build-push-action@v1
with: with:
username: BtbN username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.REG_TOKEN }} password: ${{ secrets.DOCKER_TOKEN }}
registry: docker.pkg.github.com repository: btbn/ffmpeg-builder
repository: btbn/ffmpeg-build/builder
tags: base-${{ matrix.target }} tags: base-${{ matrix.target }}
path: base-${{ matrix.target }} path: base-${{ matrix.target }}
build_targets: build_targets:
@ -50,11 +52,12 @@ jobs:
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Generate Dockerfile - name: Generate Dockerfile
run: ./generate.sh ${{ matrix.target }} ${{ matrix.variant }} run: ./generate.sh ${{ matrix.target }} ${{ matrix.variant }}
- name: Pull latest
run: docker pull btbn/ffmpeg-builder:${{ matrix.target }}-${{ matrix.variant }} || true
- name: Build and push target base - name: Build and push target base
uses: docker/build-push-action@v1 uses: docker/build-push-action@v1
with: with:
username: BtbN username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.REG_TOKEN }} password: ${{ secrets.DOCKER_TOKEN }}
registry: docker.pkg.github.com repository: btbn/ffmpeg-builder
repository: btbn/ffmpeg-build/builder
tags: ${{ matrix.target }}-${{ matrix.variant }} tags: ${{ matrix.target }}-${{ matrix.variant }}

2
base-win64/Dockerfile
View file

@ -1,4 +1,4 @@
FROM docker.pkg.github.com/btbn/ffmpeg-builds/builder:base FROM btbn/ffmpeg-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/builder:base-$TARGET" to_df "FROM $REPO: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
makeimage.sh
View file

@ -5,4 +5,4 @@ source util/vars.sh
./generate.sh "$TARGET" "$VARIANT" ./generate.sh "$TARGET" "$VARIANT"
exec docker build -t "$REPO/$TARGET-$VARIANT:latest" . exec docker build -t "$IMAGE" .

6
util/vars.sh
View file

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