Skip to content

Commit

Permalink
Merge pull request #62 from kjsanger/feature/irods-4.2.12
Browse files Browse the repository at this point in the history
Update baton from 4.0.1 to 4.1.0
  • Loading branch information
kjsanger authored May 16, 2023
2 parents dd6211a + 01d5c5e commit da0609e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
7 changes: 5 additions & 2 deletions docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ ub-18.04-irods-clients-4.2.11.$(TAG): irods_clients/ubuntu/Dockerfile ub-18.04-b
--build-arg DOCKER_IMAGE=$(subst .$(TAG),,$@) \
--build-arg DOCKER_TAG=$(TAG) \
--build-arg IRODS_VERSION=4.2.11 \
--build-arg BATON_VERSION=4.0.1 \
--build-arg BATON_VERSION=4.1.0 \
--build-arg HTSLIB_VERSION=1.17 \
--build-arg SAMTOOLS_VERSION=1.17 \
--label org.opencontainers.image.title="iRODS 4.2.11 clients, Ubuntu 18.04" \
Expand All @@ -209,6 +209,9 @@ ub-18.04-irods-clients-dev-4.2.11.$(TAG): irods_clients_dev/ubuntu/Dockerfile
--build-arg DOCKER_IMAGE=$(subst .$(TAG),,$@) \
--build-arg DOCKER_TAG=$(TAG) \
--build-arg IRODS_VERSION=4.2.11 \
--build-arg BATON_VERSION=4.1.0 \
--build-arg HTSLIB_VERSION=1.17 \
--build-arg SAMTOOLS_VERSION=1.17 \
--label org.opencontainers.image.title="iRODS 4.2.11 client development, Ubuntu 18.04" \
--label org.opencontainers.image.source=$(git_url) \
--label org.opencontainers.image.revision=$(git_commit) \
Expand All @@ -227,7 +230,7 @@ ub-18.04-irods-clients-4.2.12.$(TAG): irods_clients/ubuntu/Dockerfile ub-18.04-b
--build-arg DOCKER_IMAGE=$(subst .$(TAG),,$@) \
--build-arg DOCKER_TAG=$(TAG) \
--build-arg IRODS_VERSION=4.2.12 \
--build-arg BATON_VERSION=4.0.1 \
--build-arg BATON_VERSION=4.1.0 \
--build-arg HTSLIB_VERSION=1.17 \
--build-arg SAMTOOLS_VERSION=1.17 \
--label org.opencontainers.image.title="iRODS 4.2.12 clients, Ubuntu 18.04" \
Expand Down
4 changes: 2 additions & 2 deletions docker/irods_clients/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ ARG BASE_IMAGE=ubuntu:bionic
FROM $BASE_IMAGE as installer

# Other iRODS versions available on bionic are 4.3.0
ARG IRODS_VERSION="4.2.12"
ARG BATON_VERSION="4.0.1"
ARG IRODS_VERSION="4.2.11"
ARG BATON_VERSION="4.1.0"
ARG HTSLIB_VERSION="1.17"
ARG SAMTOOLS_VERSION="1.17"
ARG HTSLIB_PLUGINS_VERSION="201712"
Expand Down

0 comments on commit da0609e

Please sign in to comment.