Merge pull request #3 from cpu/cpu-docker-tidy-pt1

docker de-crufting (pt1)

Author: icing

docker/debian-sid/Dockerfile

@@ -2,14 +2,14 @@ FROM debian:sid
 
 RUN apt-get update; apt-get upgrade -y
 RUN apt-get install -y apt-listchanges \
-      make openssl libssl-dev libcurl4 libcurl4-openssl-dev \
+      make openssl libssl-dev libcurl4t64 libcurl4-openssl-dev \
       gcc subversion git cargo python3 iputils-ping \
-      libapr1-dev libaprutil1-dev libnghttp2-dev pip \
+      libapr1-dev libaprutil1-dev libnghttp2-dev \
       autoconf libtool libtool-bin libpcre3-dev libjansson-dev curl rsync nghttp2-client
 
-RUN pip install pytest tqdm pycurl cryptography
+RUN apt-get install -y python3-pytest python3-tqdm python3-pycurl python3-cryptography
 
-RUN apt-get install -y apache2 apache2-dev libapache2-mod-md
+RUN apt-get install -y apache2 apache2-dev
 RUN apt-get install -y cbindgen
 
 COPY docker/debian-sid/bin/* /abetterinternet/bin/
@@ -20,4 +20,4 @@ COPY test/modules /abetterinternet/mod_tls/test/modules
 COPY test/pyhttpd /abetterinternet/mod_tls/test/pyhttpd
 COPY m4 /abetterinternet/mod_tls/m4
 
-CMD ["/bin/bash", "-c", "/abetterinternet/bin/update.sh"]
+CMD ["/bin/bash", "-c", "/abetterinternet/bin/update.sh"]

docker/debian-sid/bin/update.sh

@@ -2,6 +2,7 @@
 
 TOP=/abetterinternet
 DATADIR=$TOP/data
+RUSTLS_VERSION=0.14.0
 
 fail() {
   echo "$@"
@@ -42,8 +43,8 @@ rm -rf rustls-ffi
 git clone https://github.com/rustls/rustls-ffi.git rustls-ffi
 cd rustls-ffi
 git fetch origin
-git checkout tags/v0.8.2
-make install DESTDIR=$PREFIX || fail
+git checkout "tags/v$RUSTLS_VERSION"
+make install DESTDIR=$PREFIX CRYPTO_PROVIDER=ring || fail
 
 cd "$TOP/mod_tls" ||fail
 if needs_update .installed .; then

docker/ubuntu-focal/Dockerfile

@@ -5,12 +5,12 @@ RUN apt-get update; apt-get upgrade -y
 RUN apt-get install -y apt-listchanges \
       make openssl libssl-dev libcurl4 libcurl4-openssl-dev \
       gcc subversion git cargo cbindgen python3 iputils-ping \
-      libapr1-dev libaprutil1-dev libnghttp2-dev pip \
+      libapr1-dev libaprutil1-dev libnghttp2-dev \
       autoconf libtool libtool-bin libpcre3-dev libjansson-dev curl rsync nghttp2-client
 
-RUN pip install pytest tqdm pycurl cryptography
+RUN apt-get install -y python3-pytest python3-tqdm python3-pycurl python3-cryptography
 
-RUN apt-get install -y apache2 apache2-dev libapache2-mod-md
+RUN apt-get install -y apache2 apache2-dev
 
 COPY docker/ubuntu-focal/bin/* /abetterinternet/bin/
 COPY configure.ac Makefile.am NEWS README* AUTHORS ChangeLog COPYING LICENSE /abetterinternet/mod_tls/
@@ -20,4 +20,4 @@ COPY test/modules /abetterinternet/mod_tls/test/modules
 COPY test/pyhttpd /abetterinternet/mod_tls/test/pyhttpd
 COPY m4 /abetterinternet/mod_tls/m4
 
-CMD ["/bin/bash", "-c", "/abetterinternet/bin/update.sh"]
+CMD ["/bin/bash", "-c", "/abetterinternet/bin/update.sh"]

docker/ubuntu-focal/bin/update.sh

@@ -2,6 +2,7 @@
 
 TOP=/abetterinternet
 DATADIR=$TOP/data
+RUSTLS_VERSION=0.14.0
 
 fail() {
   echo "$@"
@@ -42,8 +43,8 @@ rm -rf rustls-ffi
 git clone https://github.com/rustls/rustls-ffi.git rustls-ffi
 cd rustls-ffi
 git fetch origin
-git checkout tags/v0.8.2
-make install DESTDIR=$PREFIX || fail
+git checkout "tags/v$RUSTLS_VERSION"
+make install DESTDIR=$PREFIX CRYPTO_PROVIDER=ring || fail
 
 cd "$TOP/mod_tls" ||fail
 if needs_update .installed .; then