aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--testing/docker/alpine3.15/Dockerfile (renamed from testing/docker/alpine3.8/Dockerfile)6
-rw-r--r--testing/docker/alpine3.15/EXPERIMENTAL (renamed from testing/docker/alpine3.8/EXPERIMENTAL)2
-rw-r--r--testing/docker/archlinux/Dockerfile2
-rw-r--r--testing/docker/centos-stream9/Dockerfile (renamed from testing/docker/ubuntu16.04/Dockerfile)11
-rw-r--r--testing/docker/centos6/Dockerfile14
-rw-r--r--testing/docker/centos7/Dockerfile2
-rwxr-xr-xtesting/docker/common-scripts/ctng-install24
-rwxr-xr-xtesting/docker/dmgr.sh11
-rw-r--r--testing/docker/fedora35/Dockerfile (renamed from testing/docker/fedora29/Dockerfile)6
-rw-r--r--testing/docker/gentoo-amd64/Dockerfile2
-rw-r--r--testing/docker/mint20-amd64/Dockerfile (renamed from testing/docker/mint19-amd64/Dockerfile)4
-rw-r--r--testing/docker/ubuntu18.04/Dockerfile2
-rw-r--r--testing/docker/ubuntu21.10/Dockerfile (renamed from testing/docker/ubuntu19.10/Dockerfile)10
13 files changed, 45 insertions, 51 deletions
diff --git a/testing/docker/alpine3.8/Dockerfile b/testing/docker/alpine3.15/Dockerfile
index 6119f368..2315e789 100644
--- a/testing/docker/alpine3.8/Dockerfile
+++ b/testing/docker/alpine3.15/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.8
+FROM alpine:3.15
ARG CTNG_UID=1000
ARG CTNG_GID=1000
RUN addgroup -g $CTNG_GID ctng
@@ -7,8 +7,8 @@ RUN adduser -D -h /home/ctng -G ctng -u $CTNG_UID -s /bin/bash ctng
RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories
RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories
RUN apk update
-RUN apk add alpine-sdk wget xz git bash autoconf automake bison flex texinfo help2man gawk libtool ncurses-dev gettext-dev python-dev rsync
-RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64
+RUN apk add alpine-sdk wget xz git bash autoconf automake bison flex texinfo help2man gawk libtool ncurses-dev gettext-dev python3-dev rsync
+RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64
RUN chmod a+x /sbin/dumb-init
RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile
ENTRYPOINT [ "/sbin/dumb-init", "--" ]
diff --git a/testing/docker/alpine3.8/EXPERIMENTAL b/testing/docker/alpine3.15/EXPERIMENTAL
index 4d4d6d7a..846c43bd 100644
--- a/testing/docker/alpine3.8/EXPERIMENTAL
+++ b/testing/docker/alpine3.15/EXPERIMENTAL
@@ -1,5 +1,5 @@
Support for Alpine Linux as a build or host platform is EXPERIMENTAL. Some of
-the packages try to compile binaries for the build or the machine and fail
+the packages try to compile binaries for the build or the host machine and fail
because they expect certain GLIBC-specific types, etc: Alpine Linux does not
use GNU libc, it uses musl.
diff --git a/testing/docker/archlinux/Dockerfile b/testing/docker/archlinux/Dockerfile
index 95b80f10..571f72de 100644
--- a/testing/docker/archlinux/Dockerfile
+++ b/testing/docker/archlinux/Dockerfile
@@ -6,7 +6,7 @@ RUN pacman -Syu --noconfirm
RUN pacman -S --noconfirm base-devel git help2man python unzip wget audit rsync
RUN groupadd -g $CTNG_GID ctng
RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng
-RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64
+RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64
RUN chmod a+x /sbin/dumb-init
RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile
RUN echo 'export MENUCONFIG_COLOR=mono' >> /etc/profile
diff --git a/testing/docker/ubuntu16.04/Dockerfile b/testing/docker/centos-stream9/Dockerfile
index 4190fc54..2e6babc2 100644
--- a/testing/docker/ubuntu16.04/Dockerfile
+++ b/testing/docker/centos-stream9/Dockerfile
@@ -1,14 +1,11 @@
-FROM ubuntu:16.04
+FROM quay.io/centos/centos:stream9
ARG CTNG_UID=1000
ARG CTNG_GID=1000
RUN groupadd -g $CTNG_GID ctng
RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng
-RUN apt-get update
-RUN apt-get install -y gcc g++ gperf bison flex texinfo help2man make libncurses5-dev \
- python3-dev autoconf automake libtool libtool-bin gawk wget bzip2 xz-utils unzip \
- patch libstdc++6 rsync
-RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64
+RUN yum install -y autoconf gperf bison file flex texinfo help2man gcc-c++ libtool make patch \
+ ncurses-devel python3-devel perl-Thread-Queue bzip2 git wget which xz unzip rsync diffutils
+RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64
RUN chmod a+x /sbin/dumb-init
RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile
ENTRYPOINT [ "/sbin/dumb-init", "--" ]
-
diff --git a/testing/docker/centos6/Dockerfile b/testing/docker/centos6/Dockerfile
deleted file mode 100644
index 736557b2..00000000
--- a/testing/docker/centos6/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM centos:6
-ARG CTNG_UID=1000
-ARG CTNG_GID=1000
-RUN groupadd -g $CTNG_GID ctng
-RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng
-RUN yum install -y epel-release
-RUN yum install -y autoconf gperf bison flex texinfo help2man gcc-c++ libtool libtool-bin patch \
- ncurses-devel python34-devel perl-Thread-Queue bzip2 git wget xz unzip rsync
-RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64
-RUN chmod a+x /sbin/dumb-init
-RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile
-# The limits in this file prevent su'ing to ctng user
-RUN rm -f /etc/security/limits.d/90-nproc.conf
-ENTRYPOINT [ "/sbin/dumb-init", "--" ]
diff --git a/testing/docker/centos7/Dockerfile b/testing/docker/centos7/Dockerfile
index 7dfe1738..a595bb4d 100644
--- a/testing/docker/centos7/Dockerfile
+++ b/testing/docker/centos7/Dockerfile
@@ -7,7 +7,7 @@ RUN yum install -y epel-release
RUN yum install -y autoconf gperf bison file flex texinfo help2man gcc-c++ libtool make patch \
ncurses-devel python36-devel perl-Thread-Queue bzip2 git wget which xz unzip rsync
RUN ln -sf python36 /usr/bin/python3
-RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64
+RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64
RUN chmod a+x /sbin/dumb-init
RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile
ENTRYPOINT [ "/sbin/dumb-init", "--" ]
diff --git a/testing/docker/common-scripts/ctng-install b/testing/docker/common-scripts/ctng-install
index 1efd2644..1b635d9d 100755
--- a/testing/docker/common-scripts/ctng-install
+++ b/testing/docker/common-scripts/ctng-install
@@ -1,23 +1,25 @@
#!/bin/bash
set -e
-# Mounted directory may already be configured - or may not
-# even had bootstrapped.
+# Mounted directory may already be configured. Trying to install from
+# such directory would cause a failure in the container due to mismatch in
+# command names/paths detected by configure on the host.
+if [ -e /crosstool-ng/Makefile \
+ -o -e /crosstool-ng/.build \
+ -o -e /crosstool-ng/.build-all \
+ -o -e /crosstool-ng/config.status ]; then
+ echo "ERROR :: The host directory must not be configured/built. Run 'git clean -fxd' before" >&2
+ echo "ERROR :: installing crosstool-NG in the container." >&2
+ exit 1
+fi
tar cf - -C / \
- --exclude=crosstool-ng/.build \
- --exclude=crosstool-ng/.build.all \
--exclude=crosstool-ng/.git \
--exclude=crosstool-ng/testing/docker \
crosstool-ng | \
tar xf -
cd crosstool-ng
-if [ -r Makefile ]; then
- make distclean
-elif [ ! -r configure ]; then
- ./bootstrap
-fi
-cd ..
-cd work
+./bootstrap
+cd ../work
~/crosstool-ng/configure --prefix=/opt/ctng
make
make install
diff --git a/testing/docker/dmgr.sh b/testing/docker/dmgr.sh
index e6a93e70..2945fbbb 100755
--- a/testing/docker/dmgr.sh
+++ b/testing/docker/dmgr.sh
@@ -37,6 +37,8 @@ Action is one of:
enter Spawn a shell in the specified container.
root Spawn a root shell in the specified container.
clean Clean up in the specified container.
+ distclean Same as clean but also remove installed versions of
+ Crosstool-NG and the previously built toolchains.
If a special container name 'all' is used, the action is performed
on all the containers.
@@ -63,7 +65,7 @@ action_build()
msg "Cleaning up previous runs for ${cntr}"
do_cleanup ${cntr}/{build,install,xtools}
msg "Building Docker container for ${cntr}"
-set -x
+ set -x
docker build --no-cache -t "ctng-${cntr}" --build-arg CTNG_GID=`id -g` --build-arg CTNG_UID=`id -u` "${cntr}"
}
@@ -92,8 +94,9 @@ _dckr()
$prefix su -l ctng
fi
if [ $? != 0 ]; then
- global_rc=1
+ global_rc=1
fi
+ return $global_rc
}
# Run the test
@@ -105,9 +108,9 @@ action_install()
msg "Setting up crosstool-NG in ${cntr}"
do_cleanup ${cntr}/build
if ! _dckr "${cntr}" /common-scripts/ctng-install; then
- warn "Installation failed"
+ warn "Installation failed"
elif ! _dckr "${cntr}" /common-scripts/ctng-test-basic; then
- warn "Basic tests failed"
+ warn "Basic tests failed"
fi
}
diff --git a/testing/docker/fedora29/Dockerfile b/testing/docker/fedora35/Dockerfile
index 9d7293fb..1ce88f76 100644
--- a/testing/docker/fedora29/Dockerfile
+++ b/testing/docker/fedora35/Dockerfile
@@ -1,11 +1,11 @@
-FROM fedora:29
+FROM fedora:35
ARG CTNG_UID=1000
ARG CTNG_GID=1000
RUN groupadd -g $CTNG_GID ctng
RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng
RUN yum install -y autoconf gperf bison file flex texinfo help2man gcc-c++ libtool make patch \
- ncurses-devel python3-devel perl-Thread-Queue bzip2 git wget which xz unzip rsync
-RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64
+ ncurses-devel python3-devel perl-Thread-Queue bzip2 git wget which xz unzip rsync diffutils
+RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64
RUN chmod a+x /sbin/dumb-init
RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile
ENTRYPOINT [ "/sbin/dumb-init", "--" ]
diff --git a/testing/docker/gentoo-amd64/Dockerfile b/testing/docker/gentoo-amd64/Dockerfile
index b261cc38..b090c47c 100644
--- a/testing/docker/gentoo-amd64/Dockerfile
+++ b/testing/docker/gentoo-amd64/Dockerfile
@@ -3,7 +3,7 @@ ARG CTNG_UID=1000
ARG CTNG_GID=1000
RUN groupadd -g $CTNG_GID ctng
RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng
-RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64
+RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64
RUN chmod a+x /sbin/dumb-init
RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile
ENTRYPOINT [ "/sbin/dumb-init", "--" ]
diff --git a/testing/docker/mint19-amd64/Dockerfile b/testing/docker/mint20-amd64/Dockerfile
index 61f05628..be2ea455 100644
--- a/testing/docker/mint19-amd64/Dockerfile
+++ b/testing/docker/mint20-amd64/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxmintd/mint19-amd64
+FROM linuxmintd/mint20-amd64
ARG CTNG_UID=1000
ARG CTNG_GID=1000
RUN groupadd -g $CTNG_GID ctng
@@ -6,7 +6,7 @@ RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng
RUN apt-get update
RUN apt-get install -y gcc gperf bison flex texinfo help2man make libncurses5-dev \
python3-dev autoconf automake libtool libtool-bin gawk wget rsync
-RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64
+RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64
RUN chmod a+x /sbin/dumb-init
RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile
ENTRYPOINT [ "/sbin/dumb-init", "--" ]
diff --git a/testing/docker/ubuntu18.04/Dockerfile b/testing/docker/ubuntu18.04/Dockerfile
index f5156d22..8adc1866 100644
--- a/testing/docker/ubuntu18.04/Dockerfile
+++ b/testing/docker/ubuntu18.04/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update
RUN apt-get install -y gcc g++ gperf bison flex texinfo help2man make libncurses5-dev \
python3-dev autoconf automake libtool libtool-bin gawk wget bzip2 xz-utils unzip \
patch libstdc++6 rsync
-RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64
+RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64
RUN chmod a+x /sbin/dumb-init
RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile
ENTRYPOINT [ "/sbin/dumb-init", "--" ]
diff --git a/testing/docker/ubuntu19.10/Dockerfile b/testing/docker/ubuntu21.10/Dockerfile
index 0c39ffcd..883a26da 100644
--- a/testing/docker/ubuntu19.10/Dockerfile
+++ b/testing/docker/ubuntu21.10/Dockerfile
@@ -1,13 +1,19 @@
-FROM ubuntu:19.10
+FROM ubuntu:21.10
ARG CTNG_UID=1000
ARG CTNG_GID=1000
RUN groupadd -g $CTNG_GID ctng
RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng
+
+# Non-interactive configuration of tzdata
+ENV DEBIAN_FRONTEND noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN true
+RUN { echo 'tzdata tzdata/Areas select Etc'; echo 'tzdata tzdata/Zones/Etc select UTC'; } | debconf-set-selections
+
RUN apt-get update
RUN apt-get install -y gcc g++ gperf bison flex texinfo help2man make libncurses5-dev \
python3-dev autoconf automake libtool libtool-bin gawk wget bzip2 xz-utils unzip \
patch libstdc++6 rsync git
-RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64
+RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64
RUN chmod a+x /sbin/dumb-init
RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile
ENTRYPOINT [ "/sbin/dumb-init", "--" ]
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-16 06:37:18 +0000