[#426] Pinned docker test framework for 4.2 to Ubuntu 18 and 4.2.12.

docker-test-framework/4-2/Dockerfile.consumer

@@ -1,22 +1,22 @@
 #
 # iRODS Consumer Image.
 #
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 # TODO: Remove this line when apt gets its stuff together
-RUN sed --in-place --regexp-extended "s/(\/\/)(archive\.ubuntu)/\1nl.\2/" /etc/apt/sources.list
+#RUN sed --in-place --regexp-extended "s/(\/\/)(archive\.ubuntu)/\1nl.\2/" /etc/apt/sources.list
 
 RUN apt-get update && \
-    apt-get install -y sudo wget less lsb-release apt-transport-https netcat
+    apt-get install -y sudo wget less lsb-release apt-transport-https netcat gnupg2
 
 RUN wget -qO - https://packages.irods.org/irods-signing-key.asc | apt-key add -; \
     echo "deb [arch=amd64] https://packages.irods.org/apt/ $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/renci-irods.list; \
     apt-get update && \
-    apt-get install -y irods-runtime irods-icommands irods-server
+    apt-get install -y irods-runtime=4.2.12-1~bionic irods-icommands=4.2.12-1~bionic irods-server=4.2.12-1~bionic
 
 EXPOSE 1247 1248
 
 # Set command to execute when launching the container.
 ADD start_consumer.sh irods_consumer.input /
 RUN chmod u+x /start_consumer.sh
-ENTRYPOINT ["./start_consumer.sh"]
+ENTRYPOINT ["./start_consumer.sh"]

docker-test-framework/4-2/Dockerfile.provider

@@ -1,14 +1,16 @@
 #
 # iRODS Provider Image.
 #
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 # TODO: Remove this line when apt gets its stuff together
-RUN sed --in-place --regexp-extended "s/(\/\/)(archive\.ubuntu)/\1nl.\2/" /etc/apt/sources.list
+#RUN sed --in-place --regexp-extended "s/(\/\/)(archive\.ubuntu)/\1nl.\2/" /etc/apt/sources.list
+
+ENV DEBIAN_FRONTEND=noninteractive
 
 # Install pre-requisites
 RUN apt-get update && \
-    apt-get install -y sudo wget lsb-release apt-transport-https postgresql vim python-pip libfuse2 unixodbc rsyslog less && \
+    apt-get install -y sudo wget lsb-release apt-transport-https postgresql vim python-pip libfuse2 unixodbc rsyslog less gnupg2 && \
     pip install xmlrunner
 
 # Setup catalog database
@@ -18,7 +20,7 @@ RUN service postgresql start && su - postgres -c 'psql -f /db_commands.txt'
 RUN wget -qO - https://packages.irods.org/irods-signing-key.asc | apt-key add -; \
     echo "deb [arch=amd64] https://packages.irods.org/apt/ $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/renci-irods.list; \
     apt-get update && \
-    apt-get install -y irods-runtime irods-icommands irods-server irods-database-plugin-postgres
+    apt-get install -y irods-runtime=4.2.12-1~bionic irods-icommands=4.2.12-1~bionic irods-server=4.2.12-1~bionic irods-database-plugin-postgres=4.2.12-1~bionic
 
 EXPOSE 1247 1248
 
@@ -30,5 +32,3 @@ ADD testsetup-consortium.sh /
 RUN chmod +x /testsetup-consortium.sh
 RUN chmod u+x /start_provider.sh
 ENTRYPOINT ["./start_provider.sh"]
-
-

docker-test-framework/4-2/Dockerfile.testbuild

@@ -6,6 +6,4 @@ FROM maven:3.6.3-jdk-11
 RUN apt-get update && \
     apt-get install -y sudo wget nano
 
-
-
-CMD tail -f /dev/null
+CMD tail -f /dev/null