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

Migrate to ghcr.io

Browse source
This commit is contained in:
BtbN 2021-04-05 19:51:41 +02:00
parent e38500bb7d
commit 56c81f3275
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,12 +29,12 @@ jobs:
- name: Login to Docker - name: Login to Docker
uses: docker/login-action@v1 uses: docker/login-action@v1
with: with:
registry: docker.pkg.github.com registry: ghcr.io
username: ${{ github.actor }} username: ${{ github.actor }}
password: ${{ github.token }} password: ${{ github.token }}
- name: Image Name - name: Image Name
id: imagename id: imagename
run: echo "::set-output name=name::docker.pkg.github.com/${GITHUB_REPOSITORY,,}/base:latest" run: echo "::set-output name=name::ghcr.io/${GITHUB_REPOSITORY,,}/base:latest"
- name: Pull latest - name: Pull latest
run: docker pull ${{ steps.imagename.outputs.name }} || true run: docker pull ${{ steps.imagename.outputs.name }} || true
- name: Build base image - name: Build base image
@ -55,12 +55,12 @@ jobs:
- name: Login to Docker - name: Login to Docker
uses: docker/login-action@v1 uses: docker/login-action@v1
with: with:
registry: docker.pkg.github.com registry: ghcr.io
username: ${{ github.actor }} username: ${{ github.actor }}
password: ${{ github.token }} password: ${{ github.token }}
- name: Image Name - name: Image Name
id: imagename id: imagename
run: echo "::set-output name=name::docker.pkg.github.com/${GITHUB_REPOSITORY,,}/base-${{ matrix.target }}:latest" run: echo "::set-output name=name::ghcr.io/${GITHUB_REPOSITORY,,}/base-${{ matrix.target }}:latest"
- name: Pull latest - name: Pull latest
run: docker pull ${{ steps.imagename.outputs.name }} || true run: docker pull ${{ steps.imagename.outputs.name }} || true
- name: Build target base image - name: Build target base image
@ -84,13 +84,13 @@ jobs:
- name: Login to Docker - name: Login to Docker
uses: docker/login-action@v1 uses: docker/login-action@v1
with: with:
registry: docker.pkg.github.com registry: ghcr.io
username: ${{ github.actor }} username: ${{ github.actor }}
password: ${{ github.token }} password: ${{ github.token }}
- name: Image Name - name: Image Name
id: imagename id: imagename
run: | run: |
IMG="docker.pkg.github.com/${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}:latest" IMG="ghcr.io/${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}:latest"
echo "::set-output name=name::${IMG/ /-}" echo "::set-output name=name::${IMG/ /-}"
- name: Pull latest - name: Pull latest
run: docker pull ${{ steps.imagename.outputs.name }} || true run: docker pull ${{ steps.imagename.outputs.name }} || true
@ -113,7 +113,7 @@ jobs:
- name: Login to Docker - name: Login to Docker
uses: docker/login-action@v1 uses: docker/login-action@v1
with: with:
registry: docker.pkg.github.com registry: ghcr.io
username: ${{ github.actor }} username: ${{ github.actor }}
password: ${{ github.token }} password: ${{ github.token }}
- name: Build ffmpeg - name: Build ffmpeg

2
generate.sh
View file

@ -10,7 +10,7 @@ to_df() {
echo >> Dockerfile echo >> Dockerfile
} }
to_df "FROM docker.pkg.github.com/${REPO}/base-${TARGET}:latest" to_df "FROM ${REGISTRY}/${REPO}/base-${TARGET}:latest"
to_df "ENV TARGET=$TARGET VARIANT=$VARIANT REPO=$REPO ADDINS_STR=$ADDINS_STR" to_df "ENV TARGET=$TARGET VARIANT=$VARIANT REPO=$REPO ADDINS_STR=$ADDINS_STR"
for script in scripts.d/*.sh; do for script in scripts.d/*.sh; do

2
images/base-win32/Dockerfile
View file

@ -1,5 +1,5 @@
ARG GH_REPO=btbn/ffmpeg-builds ARG GH_REPO=btbn/ffmpeg-builds
FROM docker.pkg.github.com/$GH_REPO/base:latest FROM ghcr.io/$GH_REPO/base:latest
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive

2
images/base-win64/Dockerfile
View file

@ -1,5 +1,5 @@
ARG GH_REPO=btbn/ffmpeg-builds ARG GH_REPO=btbn/ffmpeg-builds
FROM docker.pkg.github.com/$GH_REPO/base:latest FROM ghcr.io/$GH_REPO/base:latest
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive

2
util/vars.sh
View file

@ -30,7 +30,7 @@ done
REPO="${GITHUB_REPOSITORY:-btbn/ffmpeg-builds}" REPO="${GITHUB_REPOSITORY:-btbn/ffmpeg-builds}"
REPO="${REPO,,}" REPO="${REPO,,}"
REGISTRY="docker.pkg.github.com" REGISTRY="ghcr.io"
BASE_IMAGE="${REGISTRY}/${REPO}/base:latest" BASE_IMAGE="${REGISTRY}/${REPO}/base:latest"
TARGET_IMAGE="${REGISTRY}/${REPO}/base-${TARGET}:latest" TARGET_IMAGE="${REGISTRY}/${REPO}/base-${TARGET}:latest"
IMAGE="${REGISTRY}/${REPO}/${TARGET}-${VARIANT}${ADDINS_STR:+-}${ADDINS_STR}:latest" IMAGE="${REGISTRY}/${REPO}/${TARGET}-${VARIANT}${ADDINS_STR:+-}${ADDINS_STR}:latest"