From e2bc820bdb81ff279999be37354047f7f6bb3b48 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Mon, 22 Nov 2021 13:17:47 +0100 Subject: [PATCH] Use CI made Docker image with privileges enabled to build images --- configs/config-docker.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/config-docker.conf b/configs/config-docker.conf index 945b6de7..3dad971d 100644 --- a/configs/config-docker.conf +++ b/configs/config-docker.conf @@ -18,7 +18,7 @@ else # build a new container based on provided Dockerfile display_alert "Docker container not found or out of date" display_alert "Building a Docker container" - if ! docker build -t armbian:$VERSION . ; then + if ! docker build -t ghcr.io/armbian/build:$VERSION . ; then STATUS=$? # Adding a newline, so the alert won't be shown in the same line as the error echo @@ -31,7 +31,7 @@ DOCKER_FLAGS=() # Running this container in privileged mode is a simple way to solve loop device access issues # Required for USB FEL or when writing image directly to the block device, when CARD_DEVICE is defined -#DOCKER_FLAGS+=(--privileged) +DOCKER_FLAGS+=(--privileged) # add only required capabilities instead (though MKNOD should be already present) # CAP_SYS_PTRACE is required for systemd-detect-virt in some cases @@ -106,10 +106,10 @@ If you prefer to use profile, for example, `userpatches/config-my.conf`, try: ./compile.sh my compile_uboot EOF - docker run "${DOCKER_FLAGS[@]}" -it --rm --entrypoint /usr/bin/env armbian:$VERSION "$@" /bin/bash + docker run "${DOCKER_FLAGS[@]}" -it --rm --entrypoint /usr/bin/env ghcr.io/armbian/build:$VERSION "$@" /bin/bash else display_alert "Running the container" "" "info" - docker run "${DOCKER_FLAGS[@]}" -it --rm armbian:$VERSION "$@" + docker run "${DOCKER_FLAGS[@]}" -it --rm ghcr.io/armbian/build:$VERSION "$@" fi # Docker error treatment