qjyu
/
OrangePi_CM5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for docker

This commit is contained in:
leeboby 2024-07-18 11:12:19 +08:00
parent 82f9e56057
commit ef82e033e4
6 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
external/config/sources/families/meson-sm1.conf vendored
View File

@ -68,7 +68,6 @@ family_tweaks() {
chroot $SDCARD /bin/bash -c "apt-get -y -qq install usb-modeswitch tree dnsmasq v4l-utils swig python3-dev python3-setuptools bluez libncurses-dev" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 chroot $SDCARD /bin/bash -c "apt-get -y -qq install usb-modeswitch tree dnsmasq v4l-utils swig python3-dev python3-setuptools bluez libncurses-dev" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
#install_docker
#install_balenaEtcher #install_balenaEtcher
} }

1
external/config/sources/families/rockchip-rk356x.conf vendored
View File

@ -54,7 +54,6 @@ family_tweaks_s() {
chroot $SDCARD /bin/bash -c "rm /etc/profile.d/im-config_wayland.sh" # for adbd chroot $SDCARD /bin/bash -c "rm /etc/profile.d/im-config_wayland.sh" # for adbd
fi fi
install_docker
install_balenaEtcher install_balenaEtcher
install_wiringop install_wiringop
if [[ -f ${SDCARD}/etc/pulse/default.pa && ${SELECTED_CONFIGURATION} == desktop && ${BOARD} =~ orangepicm4|orangepi3b ]]; then if [[ -f ${SDCARD}/etc/pulse/default.pa && ${SELECTED_CONFIGURATION} == desktop && ${BOARD} =~ orangepicm4|orangepi3b ]]; then

1
external/config/sources/families/rockchip-rk3588.conf vendored
View File

@ -145,7 +145,6 @@ family_tweaks_s() {
chroot $SDCARD /bin/bash -c "apt-get -y -qq install usb-modeswitch tree dnsmasq v4l-utils swig python3-dev python3-setuptools bluez libncurses-dev" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 chroot $SDCARD /bin/bash -c "apt-get -y -qq install usb-modeswitch tree dnsmasq v4l-utils swig python3-dev python3-setuptools bluez libncurses-dev" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
install_wiringop install_wiringop
install_docker
install_balenaEtcher install_balenaEtcher
# Board audio specific changes # Board audio specific changes

1
external/config/sources/families/sun50iw9.conf vendored
View File

@ -101,7 +101,6 @@ family_tweaks_s()
fi fi
install_wiringop install_wiringop
install_docker
} }
family_tweaks_bsp() family_tweaks_bsp()

2
scripts/debootstrap.sh
View File

@ -328,6 +328,8 @@ create_rootfs_cache()
[[ ${PIPESTATUS[0]} -ne 0 ]] && exit_with_error "Installation of Orange Pi desktop packages for ${BRANCH} ${BOARD} ${RELEASE} ${DESKTOP_APPGROUPS_SELECTED} ${DESKTOP_ENVIRONMENT} ${BUILD_MINIMAL} failed" [[ ${PIPESTATUS[0]} -ne 0 ]] && exit_with_error "Installation of Orange Pi desktop packages for ${BRANCH} ${BOARD} ${RELEASE} ${DESKTOP_APPGROUPS_SELECTED} ${DESKTOP_ENVIRONMENT} ${BUILD_MINIMAL} failed"
fi fi
install_docker
# Remove packages from packages.uninstall # Remove packages from packages.uninstall
display_alert "Uninstall packages" "$PACKAGE_LIST_UNINSTALL" "info" display_alert "Uninstall packages" "$PACKAGE_LIST_UNINSTALL" "info"

8
scripts/general.sh
View File

@ -1901,11 +1901,11 @@ install_docker() {
;; ;;
esac esac
if [[ ${SELECTED_CONFIGURATION} == desktop ]]; then #if [[ ${SELECTED_CONFIGURATION} == desktop ]]; then
mirror_url=https://repo.huaweicloud.com mirror_url=https://repo.huaweicloud.com
else #else
mirror_url=https://mirrors.aliyun.com # mirror_url=https://mirrors.aliyun.com
fi #fi
chroot "${SDCARD}" /bin/bash -c "curl -fsSL ${mirror_url}/docker-ce/linux/${distributor_id}/gpg | apt-key add -" chroot "${SDCARD}" /bin/bash -c "curl -fsSL ${mirror_url}/docker-ce/linux/${distributor_id}/gpg | apt-key add -"
echo "deb [arch=${ARCH}] ${mirror_url}/docker-ce/linux/${distributor_id} ${RELEASE} stable" > "${SDCARD}"/etc/apt/sources.list.d/docker.list echo "deb [arch=${ARCH}] ${mirror_url}/docker-ce/linux/${distributor_id} ${RELEASE} stable" > "${SDCARD}"/etc/apt/sources.list.d/docker.list