Switch to bullseye
This commit is contained in:
Serge Schneider
parent
a8596e0d89
commit
d9b4a4a985
9 changed files with 40 additions and 45 deletions
|
|
@ -1,4 +1,4 @@
|
|||
ARG BASE_IMAGE=debian:buster
|
||||
ARG BASE_IMAGE=debian:bullseye
|
||||
FROM ${BASE_IMAGE}
|
||||
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ The following environment variables are supported:
|
|||
that the network block device is not disconnected correctly after the Docker process has
|
||||
ended abnormally. In that case see [Disconnect an image if something went wrong](#Disconnect-an-image-if-something-went-wrong)
|
||||
|
||||
* `RELEASE` (Default: buster)
|
||||
* `RELEASE` (Default: bullseye)
|
||||
|
||||
The release version to build images against. Valid values are jessie, stretch
|
||||
buster, bullseye, and testing.
|
||||
|
|
|
|||
|
|
@ -78,10 +78,10 @@ BUILD_OPTS="$(echo "${BUILD_OPTS:-}" | sed -E 's@\-c\s?([^ ]+)@-c /config@')"
|
|||
# Check the arch of the machine we're running on. If it's 64-bit, use a 32-bit base image instead
|
||||
case "$(uname -m)" in
|
||||
x86_64|aarch64)
|
||||
BASE_IMAGE=i386/debian:buster
|
||||
BASE_IMAGE=i386/debian:bullseye
|
||||
;;
|
||||
*)
|
||||
BASE_IMAGE=debian:buster
|
||||
BASE_IMAGE=debian:bullseye
|
||||
;;
|
||||
esac
|
||||
${DOCKER} build --build-arg BASE_IMAGE=${BASE_IMAGE} -t pi-gen "${DIR}"
|
||||
|
|
|
|||
2
build.sh
2
build.sh
|
|
@ -207,7 +207,7 @@ export TARGET_HOSTNAME=${TARGET_HOSTNAME:-raspberrypi}
|
|||
|
||||
export FIRST_USER_NAME=${FIRST_USER_NAME:-pi}
|
||||
export FIRST_USER_PASS=${FIRST_USER_PASS:-raspberry}
|
||||
export RELEASE=${RELEASE:-buster}
|
||||
export RELEASE=${RELEASE:-bullseye}
|
||||
export WPA_ESSID
|
||||
export WPA_PASSWORD
|
||||
export WPA_COUNTRY
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
ssh less fbset sudo psmisc strace ed ncdu crda
|
||||
console-setup keyboard-configuration debconf-utils parted unzip
|
||||
build-essential manpages-dev python bash-completion gdb pkg-config
|
||||
python-rpi.gpio v4l-utils
|
||||
python-gpiozero
|
||||
build-essential manpages-dev python3 bash-completion gdb pkg-config
|
||||
python3-rpi.gpio v4l-utils
|
||||
python3-gpiozero
|
||||
avahi-daemon
|
||||
lua5.1
|
||||
|
|
@ -26,7 +25,6 @@ policykit-1
|
|||
ssh-import-id
|
||||
rng-tools
|
||||
ethtool
|
||||
vl805fw
|
||||
ntfs-3g
|
||||
pciutils
|
||||
rpi-eeprom
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ qpdfview gtk2-engines alsa-utils
|
|||
desktop-base
|
||||
git
|
||||
omxplayer
|
||||
raspberrypi-artwork
|
||||
policykit-1
|
||||
gvfs
|
||||
rfkill
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
python python3-pygame python-pygame python-tk
|
||||
python3 python3-tk thonny
|
||||
python3-pygame
|
||||
python3-tk thonny
|
||||
python3-pgzero
|
||||
python-serial python3-serial
|
||||
python-picamera python3-picamera
|
||||
python3-serial
|
||||
python3-picamera
|
||||
debian-reference-en dillo
|
||||
raspberrypi-net-mods raspberrypi-ui-mods
|
||||
python-pip python3-pip
|
||||
python3-pip
|
||||
python3-numpy
|
||||
pypy
|
||||
alacarte rc-gui sense-hat
|
||||
|
|
@ -13,11 +13,11 @@ tree
|
|||
libgl1-mesa-dri libgles1 libgles2-mesa xcompmgr
|
||||
geany
|
||||
piclone
|
||||
wiringpi pigpio python-pigpio python3-pigpio raspi-gpio python3-rpi.gpio
|
||||
python-spidev python3-spidev
|
||||
python-twython python3-twython
|
||||
python-smbus python3-smbus
|
||||
python-flask python3-flask
|
||||
pigpio python3-pigpio raspi-gpio python3-rpi.gpio
|
||||
python3-spidev
|
||||
python3-twython
|
||||
python3-smbus
|
||||
python3-flask
|
||||
pprompt
|
||||
piwiz
|
||||
rp-prefapps
|
||||
|
|
|
|||
|
|
@ -1,22 +1,22 @@
|
|||
python-automationhat python3-automationhat
|
||||
python-blinkt python3-blinkt
|
||||
python-cap1xxx python3-cap1xxx
|
||||
python-drumhat python3-drumhat
|
||||
python-envirophat python3-envirophat
|
||||
python-explorerhat python3-explorerhat
|
||||
python-fourletterphat python3-fourletterphat
|
||||
python-microdotphat python3-microdotphat
|
||||
python-mote python3-mote
|
||||
python-motephat python3-motephat
|
||||
python-phatbeat python3-phatbeat
|
||||
python-pianohat python3-pianohat
|
||||
python-piglow python3-piglow
|
||||
python-rainbowhat python3-rainbowhat
|
||||
python-scrollphat python3-scrollphat
|
||||
python-scrollphathd python3-scrollphathd
|
||||
python-sn3218 python3-sn3218
|
||||
python-skywriter python3-skywriter
|
||||
python-touchphat python3-touchphat
|
||||
python-buttonshim python3-buttonshim
|
||||
python-unicornhathd python3-unicornhathd
|
||||
python-pantilthat python3-pantilthat
|
||||
python3-automationhat
|
||||
python3-blinkt
|
||||
python3-cap1xxx
|
||||
python3-drumhat
|
||||
python3-envirophat
|
||||
python3-explorerhat
|
||||
python3-fourletterphat
|
||||
python3-microdotphat
|
||||
python3-mote
|
||||
python3-motephat
|
||||
python3-phatbeat
|
||||
python3-pianohat
|
||||
python3-piglow
|
||||
python3-rainbowhat
|
||||
python3-scrollphat
|
||||
python3-scrollphathd
|
||||
python3-sn3218
|
||||
python3-skywriter
|
||||
python3-touchphat
|
||||
python3-buttonshim
|
||||
python3-unicornhathd
|
||||
python3-pantilthat
|
||||
|
|
|
|||
|
|
@ -3,8 +3,7 @@ sonic-pi
|
|||
scratch nuscratch scratch3
|
||||
smartsim
|
||||
|
||||
minecraft-pi python-minecraftpi python-picraft python3-picraft
|
||||
python-sense-emu sense-emu-tools python-sense-emu-doc
|
||||
python3-sense-emu sense-emu-tools python-sense-emu-doc
|
||||
|
||||
wolfram-engine
|
||||
claws-mail
|
||||
|
|
@ -12,5 +11,4 @@ greenfoot-unbundled bluej
|
|||
nodered
|
||||
realvnc-vnc-viewer
|
||||
|
||||
python-games
|
||||
code-the-classics
|
||||
|
|
|
|||
Reference in a new issue