Adjusted dockerfile for new gnutls versions

Author: mmaehren

images/gnutls/Dockerfile-3_7_0-x

@@ -1,16 +1,18 @@
-FROM alpine-build:3.6 as gnutls-libnettle
+FROM alpine-build:3.12 as gnutls-libnettle
 RUN git clone --depth=1 --branch nettle_3.6_release_20200429 https://git.lysator.liu.se/nettle/nettle.git
 WORKDIR /src/nettle
 RUN ./.bootstrap && ./configure --disable-documentation --prefix=/build/
 RUN make && make install
 
-FROM alpine-build:3.6 as gnutls-gnutls
+FROM alpine-build:3.12 as gnutls-gnutls
 ARG VERSION
 ENV PKG_CONFIG_PATH=/build/lib/pkgconfig/
 # after 3.6.12 the tag format changed
 RUN git clone --depth=1 --branch gnutls_3_7_${VERSION} https://github.com/gnutls/gnutls || git clone --depth=1 --branch 3.7.${VERSION} https://github.com/gnutls/gnutls
+RUN apk add gtk-doc
 RUN apk add guile
 RUN apk add guile-dev
+RUN apk add libtasn1-progs
 RUN wget https://ftp.gnu.org/gnu/autogen/rel5.18.12/autogen-5.18.12.tar.gz
 RUN tar -xzf autogen-5.18.12.tar.gz
 WORKDIR /src/autogen-5.18.12/

images/gnutls/gnutls.sh

@@ -2,13 +2,13 @@
 cd "$(dirname "$0")" || exit 1
 source ../helper-functions.sh
 
-array=(0)
+array=(0 1 2 3 4 5 6 7 8)
 typeset -i i=0 max=${#array[*]}
 while (( i < max ))
 do
 	echo "Building: GnuTLS 3.7.${array[$i]}"
-	_docker build --build-arg VERSION=${array[$i]} -t ${DOCKER_REPOSITORY}gnutls-server:3.7.${array[$i]} -f Dockerfile-3_7_0-x --target gnutls-server .
-	_docker build --build-arg VERSION=${array[$i]} -t ${DOCKER_REPOSITORY}gnutls-client:3.7.${array[$i]} -f Dockerfile-3_7_0-x --target gnutls-client .
+	_docker build --build-arg VERSION=${array[$i]} -t ${DOCKER_REPOSITORY}gnutls-server:3.7.${array[$i]} -f Dockerfile-3_7_0-x --target gnutls-server --progress=plain .
+	_docker build --build-arg VERSION=${array[$i]} -t ${DOCKER_REPOSITORY}gnutls-client:3.7.${array[$i]} -f Dockerfile-3_7_0-x --target gnutls-client --progress=plain .
 	i=i+1
 done