use plain docker output and set compat per dist
This commit is contained in:
parent
7737ebd46d
commit
aa67675ec9
1
build.sh
1
build.sh
@ -10,6 +10,7 @@ echo "RUN apt-get update && \\" >> Dockerfile.temp
|
||||
echo " DEBIAN_FRONTEND=noninteractive apt-get install -y -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" $CPYTHON_DEPS" >> Dockerfile.temp
|
||||
|
||||
# build image with just the deps
|
||||
export BUILDKIT_PROGRESS=plain
|
||||
docker build -t extbuilder-${EXTPYTHON_DIST}-deps -f Dockerfile.temp .
|
||||
rm -f Dockerfile.temp
|
||||
|
||||
|
@ -2,6 +2,8 @@
|
||||
|
||||
RELEASES="trusty xenial bionic focal jammy noble"
|
||||
|
||||
export BUILDKIT_PROGRESS=plain
|
||||
|
||||
for release in $RELEASES ; do
|
||||
docker pull ubuntu:${release}
|
||||
docker build -t extbuilder-${release} -f Dockerfile.${release} .
|
||||
|
@ -1,11 +1,21 @@
|
||||
#!/bin/bash -eux
|
||||
|
||||
. /tmp/vars.sh
|
||||
. /etc/lsb-release #for DISTRIB_CODENAME
|
||||
|
||||
function template {
|
||||
perl -p -e 's/\$\{([^}]+)\}/defined $ENV{$1} ? $ENV{$1} : $&/eg' < $1
|
||||
}
|
||||
|
||||
declare -A dist2compat
|
||||
dist2compat[trusty]=9
|
||||
dist2compat[xenial]=9
|
||||
dist2compat[bionic]=9
|
||||
dist2compat[focal]=9
|
||||
dist2compat[disco]=9
|
||||
dist2compat[jammy]=10
|
||||
dist2compat[noble]=10
|
||||
|
||||
# create build dir
|
||||
cd /build
|
||||
mkdir work
|
||||
@ -20,7 +30,7 @@ mkdir debian
|
||||
export BUILD_DATE=$(date -R)
|
||||
template /src/debian/changelog | tee debian/changelog
|
||||
template /src/debian/control | tee debian/control
|
||||
cp /src/debian/compat debian/
|
||||
echo ${dist2compat[$DISTRIB_CODENAME]} > debian/compat
|
||||
cp /src/Makefile ./
|
||||
sed -i -E "s/_OPT_DIR_/${PYTHON_MAJOR}/" Makefile
|
||||
|
||||
|
@ -1 +0,0 @@
|
||||
9
|
Loading…
Reference in New Issue
Block a user