diff --git a/README.md b/README.md index c817a49..861fe53 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ This is a Docker image of a vanilla iRODS >=4.2.11 server that works out of the box. To be used for running tests only. The server version may be chosen by passing the Docker build argument -`--build-arg IRODS_VERSION=` (default is 4.3.0). +`--build-arg IRODS_VERSION=` (default is 4.3.1). ### irods/ubuntu/22.04 ### @@ -81,23 +81,6 @@ e.g. Install wrappers to $PREFIX/bin: ... -rwxr-xr-x 1 kdj staff 409 Apr 12 15:47 samtools -# iRODS Client Bundle - -The release contains irods 4.2.7 clients bundled from -`ub-16.04-irods-clients-4.2.7` to be used on ONT machines, where we -cannot run containers. Given the complexity of the iRODS clients' -dependency chain, the location of the plugins must be provided in the -iRODS environment file using the `irods_plugins_home` key. Some -dependencies for these plugins must also be preloaded to avoid local -system libraries from being pulled in, e.g.: - - $ LD_PRELOAD=path/libarchive.so.16:path/libcrypto.so.1.0.0:path/libssl.so.1.0.0:path/libxml2.so.2:path/libicuuc.so.55:path/libicudata.so.55 \ - ./exodus/bin/iinit - -A script to do this is set up by the ansible used to set up the instruments -(https://gitlab.internal.sanger.ac.uk/npg/oxford_nanopore_instruments). - - ## Author Keith James kdj@sanger.ac.uk diff --git a/docker/Makefile b/docker/Makefile index 53fd316..c6e707d 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -173,7 +173,7 @@ ub-22.04-irods-4.3.3.$(TAG): irods/ubuntu/22.04/Dockerfile ub-22.04-base.$(TAG) docker buildx build $(DOCKER_ARGS) \ --load \ --build-arg BASE_IMAGE=$(DOCKER_PREFIX)/ub-22.04-base \ - --build-arg IRODS_VERSION=4.3.2 \ + --build-arg IRODS_VERSION=4.3.3 \ --label org.opencontainers.image.title="iRODS 4.3.3 server, Ubuntu 22.04" \ --label org.opencontainers.image.source=$(git_url) \ --label org.opencontainers.image.revision=$(git_commit) \ @@ -206,7 +206,7 @@ ub-16.04-irods-clients-4.2.7.$(TAG): irods_clients/ubuntu/16.04/Dockerfile ub-16 --build-arg DOCKER_IMAGE=$(subst .$(TAG),,$@) \ --build-arg DOCKER_TAG=$(TAG) \ --build-arg IRODS_VERSION=4.2.7 \ - --build-arg BATON_VERSION=4.2.2 \ + --build-arg BATON_VERSION=4.3.1 \ --build-arg HTSLIB_VERSION=1.20 \ --build-arg SAMTOOLS_VERSION=1.20 \ --build-arg BCFTOOLS_VERSION=1.20 \ @@ -228,7 +228,7 @@ ub-18.04-irods-clients-4.2.11.$(TAG): irods_clients/ubuntu/18.04/Dockerfile ub-1 --build-arg DOCKER_IMAGE=$(subst .$(TAG),,$@) \ --build-arg DOCKER_TAG=$(TAG) \ --build-arg IRODS_VERSION=4.2.11 \ - --build-arg BATON_VERSION=4.2.2 \ + --build-arg BATON_VERSION=4.3.1 \ --build-arg HTSLIB_VERSION=1.20 \ --build-arg SAMTOOLS_VERSION=1.20 \ --build-arg BCFTOOLS_VERSION=1.20 \ @@ -251,7 +251,7 @@ ub-18.04-irods-clients-4.2.12.$(TAG): irods_clients/ubuntu/18.04/Dockerfile ub-1 --build-arg DOCKER_IMAGE=$(subst .$(TAG),,$@) \ --build-arg DOCKER_TAG=$(TAG) \ --build-arg IRODS_VERSION=4.2.12 \ - --build-arg BATON_VERSION=4.2.1 \ + --build-arg BATON_VERSION=4.3.1 \ --build-arg HTSLIB_VERSION=1.20 \ --build-arg SAMTOOLS_VERSION=1.20 \ --build-arg BCFTOOLS_VERSION=1.20 \ @@ -274,7 +274,7 @@ ub-22.04-irods-clients-4.3.1.$(TAG): irods_clients/ubuntu/22.04/Dockerfile --build-arg DOCKER_IMAGE=$(subst .$(TAG),,$@) \ --build-arg DOCKER_TAG=$(TAG) \ --build-arg IRODS_VERSION=4.3.1 \ - --build-arg BATON_VERSION=4.2.2 \ + --build-arg BATON_VERSION=4.3.1 \ --build-arg HTSLIB_VERSION=1.20 \ --build-arg SAMTOOLS_VERSION=1.20 \ --build-arg BCFTOOLS_VERSION=1.20 \ @@ -297,7 +297,7 @@ ub-22.04-irods-clients-4.3.2.$(TAG): irods_clients/ubuntu/22.04/Dockerfile --build-arg DOCKER_IMAGE=$(subst .$(TAG),,$@) \ --build-arg DOCKER_TAG=$(TAG) \ --build-arg IRODS_VERSION=4.3.2 \ - --build-arg BATON_VERSION=4.2.2 \ + --build-arg BATON_VERSION=4.3.1 \ --build-arg HTSLIB_VERSION=1.20 \ --build-arg SAMTOOLS_VERSION=1.20 \ --build-arg BCFTOOLS_VERSION=1.20 \ @@ -320,7 +320,7 @@ ub-22.04-irods-clients-4.3.3.$(TAG): irods_clients/ubuntu/22.04/Dockerfile --build-arg DOCKER_IMAGE=$(subst .$(TAG),,$@) \ --build-arg DOCKER_TAG=$(TAG) \ --build-arg IRODS_VERSION=4.3.3 \ - --build-arg BATON_VERSION=4.2.2 \ + --build-arg BATON_VERSION=4.3.1 \ --build-arg HTSLIB_VERSION=1.20 \ --build-arg SAMTOOLS_VERSION=1.20 \ --build-arg BCFTOOLS_VERSION=1.20 \ @@ -342,7 +342,7 @@ ub-22.04-irods-clients-4.3-nightly.$(TAG): irods_clients/ubuntu/22.04/Dockerfile --build-arg DOCKER_IMAGE=$(subst .$(TAG),,$@) \ --build-arg DOCKER_TAG=$(TAG) \ --build-arg IRODS_VERSION=4.3-nightly \ - --build-arg BATON_VERSION=4.2.2 \ + --build-arg BATON_VERSION=4.3.1 \ --build-arg HTSLIB_VERSION=1.20 \ --build-arg SAMTOOLS_VERSION=1.20 \ --build-arg BCFTOOLS_VERSION=1.20 \ diff --git a/docker/irods_clients/ubuntu/16.04/Dockerfile b/docker/irods_clients/ubuntu/16.04/Dockerfile index 4687605..48862c7 100644 --- a/docker/irods_clients/ubuntu/16.04/Dockerfile +++ b/docker/irods_clients/ubuntu/16.04/Dockerfile @@ -6,7 +6,7 @@ ARG IRODS_VERSION="4.2.7" # The latest usable versions -ARG BATON_VERSION="4.2.1" +ARG BATON_VERSION="4.3.1" ARG HTSLIB_VERSION="1.18" ARG SAMTOOLS_VERSION="1.18" ARG BCFTOOLS_VERSION="1.18" diff --git a/docker/irods_clients/ubuntu/18.04/Dockerfile b/docker/irods_clients/ubuntu/18.04/Dockerfile index 504c49e..8e86864 100644 --- a/docker/irods_clients/ubuntu/18.04/Dockerfile +++ b/docker/irods_clients/ubuntu/18.04/Dockerfile @@ -8,7 +8,7 @@ ARG IRODS_VERSION="4.3.1" ARG IRODS_REVISION="1" # The latest usable versions -ARG BATON_VERSION="4.2.1" +ARG BATON_VERSION="4.3.1" ARG HTSLIB_VERSION="1.18" ARG SAMTOOLS_VERSION="1.18" ARG BCFTOOLS_VERSION="1.18"