Migrate to ghcr.io
This commit is contained in:
parent
e38500bb7d
commit
56c81f3275
5 changed files with 11 additions and 11 deletions
14
.github/workflows/build.yml
vendored
14
.github/workflows/build.yml
vendored
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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"
|
||||||
|
|
Loading…
Reference in a new issue