Qubot/armbian-b
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'armbian-next'

Browse Source
This commit is contained in:
Igor 2023-02-18 16:44:41 +01:00
commit 99b8317976
No known key found for this signature in database
GPG Key ID: 7DF2FC8F0E1B825A
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/functions/artifacts/artifact-rootfs.sh
View File

@ -116,7 +116,7 @@ function artifact_rootfs_cli_adapter_config_prep() {
}
function artifact_rootfs_get_default_oci_target() {
artifact_oci_target_base="ghcr.io/rpardini/armbian-release/"
artifact_oci_target_base="ghcr.io/armbian/rootfs-cache/"
}
function artifact_rootfs_is_available_in_local_cache() {

2
lib/functions/host/docker.sh
View File

@ -126,7 +126,7 @@ function docker_cli_prepare() {
# If we're NOT building the public, official image, then USE the public, official image as base.
# IMPORTANT: This has to match the naming scheme for tag the is used in the GitHub actions workflow.
if [[ "${DOCKERFILE_USE_ARMBIAN_IMAGE_AS_BASE}" != "no" && "${DOCKER_SIMULATE_CLEAN}" != "yes" ]]; then
DOCKER_ARMBIAN_BASE_IMAGE="ghcr.io/armbian/cache:armbian-${wanted_os_tag}-${wanted_release_tag}-latest"
DOCKER_ARMBIAN_BASE_IMAGE="ghcr.io/armbian/docker-armbian-build:armbian-${wanted_os_tag}-${wanted_release_tag}-latest"
display_alert "Using prebuilt Armbian image as base for '${wanted_os_tag}-${wanted_release_tag}'" "DOCKER_ARMBIAN_BASE_IMAGE: ${DOCKER_ARMBIAN_BASE_IMAGE}" "info"
fi