diff --git a/docker-test-framework/4-3/Dockerfile.consumer b/docker-test-framework/4-3/Dockerfile.consumer index b3fe78fbe..65b010ea8 100644 --- a/docker-test-framework/4-3/Dockerfile.consumer +++ b/docker-test-framework/4-3/Dockerfile.consumer @@ -10,10 +10,14 @@ RUN sed --in-place --regexp-extended "s/(\/\/)(archive\.ubuntu)/\1nl.\2/" /etc/a RUN apt-get update && \ apt-get install -y sudo wget less lsb-release apt-transport-https netcat gnupg2 +ARG irods_package_version=4.3.1-0~focal 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=${irods_package_version} \ + irods-icommands=${irods_package_version} \ + irods-server=${irods_package_version} EXPOSE 1247 1248 diff --git a/docker-test-framework/4-3/Dockerfile.provider b/docker-test-framework/4-3/Dockerfile.provider index 3b3f746a5..27a4f5e2f 100644 --- a/docker-test-framework/4-3/Dockerfile.provider +++ b/docker-test-framework/4-3/Dockerfile.provider @@ -16,10 +16,15 @@ RUN apt-get update && \ ADD db_commands.txt / RUN service postgresql start && su - postgres -c 'psql -f /db_commands.txt' +ARG irods_package_version=4.3.1-0~focal 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=${irods_package_version} \ + irods-icommands=${irods_package_version} \ + irods-server=${irods_package_version} \ + irods-database-plugin-postgres=${irods_package_version} EXPOSE 1247 1248 @@ -29,5 +34,3 @@ ADD testsetup-consortium.sh / RUN chmod +x /testsetup-consortium.sh RUN chmod u+x /start_provider.sh ENTRYPOINT ["./start_provider.sh"] - - diff --git a/docker-test-framework/4-3/docker-compose.yml b/docker-test-framework/4-3/docker-compose.yml index 78fe0fb23..42ed7771a 100644 --- a/docker-test-framework/4-3/docker-compose.yml +++ b/docker-test-framework/4-3/docker-compose.yml @@ -6,6 +6,8 @@ services: build: context: . dockerfile: Dockerfile.provider + args: + irods_package_version: 4.3.1-0~focal hostname: icat.example.org networks: irodsnet: @@ -34,6 +36,8 @@ services: build: context: . dockerfile: Dockerfile.consumer + args: + irods_package_version: 4.3.1-0~focal hostname: resource1.example.org networks: irodsnet: @@ -45,8 +49,3 @@ services: networks: irodsnet: driver: bridge - - - - -