[#418] Updated docker-test-framework/latest for iRODS 4.3 (ubuntu 20.04)

docker-test-framework/latest/Dockerfile.consumer

@@ -1,13 +1,14 @@
 #
 # iRODS Consumer Image.
 #
-FROM ubuntu:16.04
+FROM ubuntu:20.04
+ARG DEBIAN_FRONTEND=noninteractive
 
 # 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 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; \
@@ -19,4 +20,4 @@ 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/latest/Dockerfile.provider

@@ -1,15 +1,16 @@
 #
 # iRODS Provider Image.
 #
-FROM ubuntu:16.04
+FROM ubuntu:20.04
+ARG DEBIAN_FRONTEND=noninteractive
 
 # 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
 
 # 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 && \
-    pip install xmlrunner
+    apt-get install -y sudo wget lsb-release apt-transport-https postgresql vim python3-pip libfuse2 unixodbc rsyslog less gnupg2 && \
+    pip3 install xmlrunner
 
 # Setup catalog database
 ADD db_commands.txt /

docker-test-framework/latest/irods_consumer.input

@@ -2,15 +2,23 @@
 
 2
 
+
+
+
 icat.example.org
 
 
 
 
 
 rods
-
+y
 TEMPORARY_ZONE_KEY
 32_byte_server_negotiation_key__
 32_byte_server_control_plane_key
 rods
+
+
+
+
+

docker-test-framework/latest/start_consumer.sh

@@ -9,7 +9,7 @@ done
 
 # Set up iRODS.
 sed -i '5s/.*/'$topo_provider'/'
-python /var/lib/irods/scripts/setup_irods.py < /irods_consumer.input
+python3 /var/lib/irods/scripts/setup_irods.py < /irods_consumer.input
 
 # Keep container running if the test fails.
 tail -f /dev/null

docker-test-framework/latest/start_provider.sh

@@ -11,7 +11,8 @@ done
 echo Postgres took approximately $counter seconds to fully start ...
 
 # Set up iRODS.
-python /var/lib/irods/scripts/setup_irods.py < /var/lib/irods/packaging/localhost_setup_postgres.input
+python3 /var/lib/irods/scripts/setup_irods.py < /var/lib/irods/packaging/localhost_setup_postgres.input
+service irods start
 
 echo Running Test Setup Script
 su irods -c '/testsetup-consortium.sh'