Move Docker image to Ubuntu 22.04 LTS (#3481)

* Add tested Docker files for current Debian / Ubuntu, defaulting to Jammy

* Update update-docker.yml

* Update update-docker.yml

* Solving with Docker run parameters

* Just variable name change

* Update update-docker.yml

* Change to master

Also merge https://github.com/armbian/scripts/pull/6

* Set default values

* Add missing libssl1.1
This commit is contained in:
Igor Pečovnik
2022-03-30 07:26:59 +02:00
committed by GitHub
parent eb6acd68d3
commit af903b2ccd
5 changed files with 20 additions and 6 deletions

View File

@@ -18,3 +18,7 @@ jobs:
needs: Docker needs: Docker
if: ${{ github.repository_owner == 'Armbian' }} if: ${{ github.repository_owner == 'Armbian' }}
uses: armbian/scripts/.github/workflows/build-test-image-docker.yml@master uses: armbian/scripts/.github/workflows/build-test-image-docker.yml@master
with:
runner: "ubuntu-latest"
reference: master

View File

@@ -238,7 +238,7 @@ if ! ls "${SRC}"/userpatches/{config-default.conf,config-docker.conf,config-vagr
# Create Docker file # Create Docker file
if [[ ! -f "${SRC}"/userpatches/Dockerfile ]]; then if [[ ! -f "${SRC}"/userpatches/Dockerfile ]]; then
cp "${SRC}"/config/templates/Dockerfile "${SRC}"/userpatches/Dockerfile || exit 1 cp "${SRC}"/config/templates/Dockerfile "${SRC}"/userpatches/Dockerfile || exit 1
fi fi
# Create Vagrant config # Create Vagrant config

View File

@@ -1,4 +1,7 @@
FROM ubuntu:21.04 ARG BASE_IMAGE=ubuntu:jammy
FROM $BASE_IMAGE as armbian_builder
ARG ARM_GCC_COMPILER='g++-11-arm-linux-gnueabihf'
ENV ARM_GCC_COMPILER $ARM_GCC_COMPILER
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get -y install \
joe \ joe \
@@ -20,6 +23,7 @@ RUN sh -c " \
RUN apt-get update \ RUN apt-get update \
&& apt-get -y upgrade \ && apt-get -y upgrade \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
$ARM_GCC_COMPILER \
acl \ acl \
aptly \ aptly \
aria2 \ aria2 \
@@ -45,7 +49,6 @@ RUN apt-get update \
f2fs-tools \ f2fs-tools \
fakeroot \ fakeroot \
flex \ flex \
g++-8-arm-linux-gnueabihf \
gawk \ gawk \
gcc-arm-linux-gnueabihf \ gcc-arm-linux-gnueabihf \
gcc-arm-linux-gnueabi \ gcc-arm-linux-gnueabi \
@@ -67,6 +70,7 @@ RUN apt-get update \
libpython2.7-dev \ libpython2.7-dev \
libpython3-dev \ libpython3-dev \
libssl-dev \ libssl-dev \
libssl1.1 \
libusb-1.0-0-dev \ libusb-1.0-0-dev \
linux-base \ linux-base \
locales \ locales \

View File

@@ -3,6 +3,12 @@
# This is a Docker launcher file. To set up the configuration, use command line arguments to compile.sh # This is a Docker launcher file. To set up the configuration, use command line arguments to compile.sh
# or use pass a config file as a parameter ./compile docker [example] BUILD_KERNEL="yes" ... # or use pass a config file as a parameter ./compile docker [example] BUILD_KERNEL="yes" ...
# Default values for Docker image
ARM_GCC_COMPILER=g++-11-arm-linux-gnueabihf
BASE_IMAGE=ubuntu:22.04
[[ ! -c /dev/loop-control ]] && display_alert "/dev/loop-control does not exist, image building may not work" "" "wrn" [[ ! -c /dev/loop-control ]] && display_alert "/dev/loop-control does not exist, image building may not work" "" "wrn"
# second argument can be a build parameter or a config file # second argument can be a build parameter or a config file
@@ -18,7 +24,7 @@ else
# build a new container based on provided Dockerfile # build a new container based on provided Dockerfile
display_alert "Docker container not found or out of date" display_alert "Docker container not found or out of date"
display_alert "Building a Docker container" display_alert "Building a Docker container"
if ! docker build -t armbian:$VERSION . ; then if ! docker build --build-arg ARM_GCC_COMPILER=$ARM_GCC_COMPILER --build-arg BASE_IMAGE=$BASE_IMAGE -t armbian:$VERSION . ; then
STATUS=$? STATUS=$?
# Adding a newline, so the alert won't be shown in the same line as the error # Adding a newline, so the alert won't be shown in the same line as the error
echo echo

View File

@@ -1398,7 +1398,7 @@ prepare_host()
fi fi
# Add support for Ubuntu 20.04, 21.04 and Mint 20.x # Add support for Ubuntu 20.04, 21.04 and Mint 20.x
if [[ $HOSTRELEASE =~ ^(focal|impish|hirsute|ulyana|ulyssa|bullseye|uma|una)$ ]]; then if [[ $HOSTRELEASE =~ ^(focal|impish|hirsute|jammy|ulyana|ulyssa|bullseye|uma|una)$ ]]; then
hostdeps+=" python2 python3" hostdeps+=" python2 python3"
ln -fs /usr/bin/python2.7 /usr/bin/python2 ln -fs /usr/bin/python2.7 /usr/bin/python2
ln -fs /usr/bin/python2.7 /usr/bin/python ln -fs /usr/bin/python2.7 /usr/bin/python
@@ -1413,7 +1413,7 @@ prepare_host()
# #
# NO_HOST_RELEASE_CHECK overrides the check for a supported host system # NO_HOST_RELEASE_CHECK overrides the check for a supported host system
# Disable host OS check at your own risk. Any issues reported with unsupported releases will be closed without discussion # Disable host OS check at your own risk. Any issues reported with unsupported releases will be closed without discussion
if [[ -z $HOSTRELEASE || "buster bullseye focal impish hirsute debbie tricia ulyana ulyssa uma una" != *"$HOSTRELEASE"* ]]; then if [[ -z $HOSTRELEASE || "buster bullseye focal impish hirsute jammy debbie tricia ulyana ulyssa uma una" != *"$HOSTRELEASE"* ]]; then
if [[ $NO_HOST_RELEASE_CHECK == yes ]]; then if [[ $NO_HOST_RELEASE_CHECK == yes ]]; then
display_alert "You are running on an unsupported system" "${HOSTRELEASE:-(unknown)}" "wrn" display_alert "You are running on an unsupported system" "${HOSTRELEASE:-(unknown)}" "wrn"
display_alert "Do not report any errors, warnings or other issues encountered beyond this point" "" "wrn" display_alert "Do not report any errors, warnings or other issues encountered beyond this point" "" "wrn"