enhance(scripts): use GitHub package registry for Docker image

Should provide better (maybe) download speed when using GitHub Actions.
This commit is contained in:
Leonid Pliushch 2022-07-23 00:19:08 +03:00
parent 709213302f
commit dc3869ad37
No known key found for this signature in database
GPG Key ID: 268047C7D92B9FF0
6 changed files with 18 additions and 6 deletions

View File

@ -16,6 +16,9 @@ on:
jobs:
update:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- name: Clone repository
uses: actions/checkout@v3
@ -23,13 +26,22 @@ jobs:
run: |
cd ./scripts
docker build --tag termux/package-builder:latest .
docker tag termux/package-builder:latest ghcr.io/termux/package-builder:latest
- name: Login to GHCR
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'termux/termux-packages'
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Login to Docker Hub
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'termux/termux-packages'
uses: docker/login-action@v1
with:
username: grimler
password: ${{ secrets.DOCKER_TOKEN }}
- name: Push to Docker Hub
- name: Push
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'termux/termux-packages'
run: |
docker push ghcr.io/termux/package-builder:latest
docker push termux/package-builder:latest

View File

@ -74,7 +74,7 @@ jobs:
if grep -qP '^scripts/(Dockerfile|setup-android-sdk\.sh|setup-ubuntu\.sh)$' <<< "$CHANGED_FILES"; then
echo "Detected changes for environment setup scripts. Building custom Docker image now."
cd ./scripts
docker build -t termux/package-builder:latest .
docker build -t ghcr.io/termux/package-builder:latest .
cd ..
fi

View File

@ -4,7 +4,7 @@
#
# .\scripts\run-docker.ps1 ./build-package.sh -a arm libandroid-support
Set-Variable -Name IMAGE_NAME -Value "termux/package-builder"
Set-Variable -Name IMAGE_NAME -Value "ghcr.io/termux/package-builder"
Set-Variable -Name CONTAINER_NAME -Value "termux-package-builder"
Write-Output "Running container ${CONTAINER_NAME} from image ${IMAGE_NAME}..."

View File

@ -21,7 +21,7 @@ else
VOLUME=$REPOROOT:$CONTAINER_HOME_DIR/termux-packages
fi
: ${TERMUX_BUILDER_IMAGE_NAME:=termux/package-builder}
: ${TERMUX_BUILDER_IMAGE_NAME:=ghcr.io/termux/package-builder}
: ${CONTAINER_NAME:=termux-package-builder}
USER=builder

View File

@ -5,7 +5,7 @@
# .\scripts\update-docker.ps1
Set-Variable -Name CONTAINER -Value "termux-package-builder"
Set-Variable -Name IMAGE -Value "termux/package-builder"
Set-Variable -Name IMAGE -Value "ghcr.io/termux/package-builder"
docker pull $IMAGE

View File

@ -2,7 +2,7 @@
set -e -u
CONTAINER=termux-package-builder
IMAGE=termux/package-builder
IMAGE=ghcr.io/termux/package-builder
docker pull $IMAGE