enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Docker image doesn't build due to library changes (#3641)

Browse Source 
* Fix docker creation logic
* Update update-docker.yml
* Change component reference
This commit is contained in:
Igor Pečovnik 2022-04-06 18:18:25 +02:00 committed by GitHub
parent bf0289eb23
commit cc0d480156
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/templates/Dockerfile
View File

@ -1,7 +1,7 @@
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 CUSTOM_PACKAGES='g++-11-arm-linux-gnueabihf libssl3'
ENV CUSTOM_PACKAGES $CUSTOM_PACKAGES
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get -y install \
joe \
@ -23,7 +23,7 @@ RUN sh -c " \
RUN apt-get update \
&& apt-get -y upgrade \
&& apt-get install -y --no-install-recommends \
$ARM_GCC_COMPILER \
$CUSTOM_PACKAGES \
acl \
aptly \
aria2 \
@ -70,7 +70,6 @@ RUN apt-get update \
libpython2.7-dev \
libpython3-dev \
libssl-dev \
libssl1.1 \
libusb-1.0-0-dev \
linux-base \
locales \

6
config/templates/config-docker.conf
View File

@ -5,8 +5,8 @@
# Default values for Docker image
ARM_GCC_COMPILER=g++-11-arm-linux-gnueabihf
BASE_IMAGE=ubuntu:22.04
CUSTOM_PACKAGES="g++-11-arm-linux-gnueabihf libssl3"
BASE_IMAGE="ubuntu:22.04"
[[ ! -c /dev/loop-control ]] && display_alert "/dev/loop-control does not exist, image building may not work" "" "wrn"
@ -24,7 +24,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 --build-arg ARM_GCC_COMPILER=$ARM_GCC_COMPILER --build-arg BASE_IMAGE=$BASE_IMAGE -t armbian:$VERSION . ; then
if ! docker build --build-arg CUSTOM_PACKAGES="$CUSTOM_PACKAGES" --build-arg BASE_IMAGE=$BASE_IMAGE -t armbian:$VERSION . ; then
STATUS=$?
# Adding a newline, so the alert won't be shown in the same line as the error
echo