From a23c31c7d5b1e4c8130fb781bc8b46c28eced4d2 Mon Sep 17 00:00:00 2001 From: Avnish Pratap Singh Date: Tue, 30 Jul 2024 14:09:33 +0100 Subject: [PATCH 1/3] update container image labels --- docker/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/Makefile b/docker/Makefile index d896e57..0931b64 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -42,11 +42,12 @@ samtools.$(TAG): Dockerfile --build-arg SAMTOOLS_VERSION=1.20 \ --build-arg BCFTOOLS_VERSION=1.20 \ --build-arg DEFLATE_VERSION=1.20 \ - --label org.opencontainers.image.title="samtools" \ + --label org.opencontainers.image.title=$(image_names) \ --label org.opencontainers.image.source=$(git_url) \ --label org.opencontainers.image.revision=$(git_commit) \ --label org.opencontainers.image.version=$(TAG) \ --label org.opencontainers.image.created=$(NOW) \ + --label org.opencontainers.image.vendor=npg.sanger.ac.uk \ --tag $(DOCKER_PREFIX)/samtools:latest \ --tag $(DOCKER_PREFIX)/samtools:$(TAG) --file $< . touch $@ From 1edc38604ae2958391a7c89058e04ee6947afa68 Mon Sep 17 00:00:00 2001 From: "David K. Jackson" Date: Thu, 12 Sep 2024 18:07:45 +0100 Subject: [PATCH 2/3] samtools/htslib/bcftools 1.21 --- docker/Dockerfile | 6 +++--- docker/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index a02b129..865a7cb 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ ARG IRODS_VERSION="4.2.11" -ARG HTSLIB_VERSION=1.20 -ARG SAMTOOLS_VERSION=1.20 -ARG BCFTOOLS_VERSION=1.20 +ARG HTSLIB_VERSION=1.21 +ARG SAMTOOLS_VERSION=1.21 +ARG BCFTOOLS_VERSION=1.21 ARG DEFLATE_VERSION=1.20 FROM ubuntu:18.04 AS samtools_build diff --git a/docker/Makefile b/docker/Makefile index 0931b64..a8b21fa 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -38,9 +38,9 @@ samtools.$(TAG): Dockerfile --build-arg DOCKER_TAG=$(TAG) \ --build-arg IRODS_VERSION=4.2.11 \ --build-arg BATON_VERSION=4.2.1 \ - --build-arg HTSLIB_VERSION=1.20 \ - --build-arg SAMTOOLS_VERSION=1.20 \ - --build-arg BCFTOOLS_VERSION=1.20 \ + --build-arg HTSLIB_VERSION=1.21 \ + --build-arg SAMTOOLS_VERSION=1.21 \ + --build-arg BCFTOOLS_VERSION=1.21 \ --build-arg DEFLATE_VERSION=1.20 \ --label org.opencontainers.image.title=$(image_names) \ --label org.opencontainers.image.source=$(git_url) \ From 3d10ab78801e0b73101f2c31def1b1b182deb828 Mon Sep 17 00:00:00 2001 From: jmtcsngr Date: Thu, 7 Mar 2024 15:12:11 +0000 Subject: [PATCH 3/3] add tag/release instructions to README --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index f72ec20..34e29df 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,21 @@ metadata based on `git describe`. cd ./docker make +## Release instructions + +When tagging a new version please use annotated tags in the command line +interface. + +```bash +git clone --branch master git@github.com:wtsi-npg/samtools_container.git samtools_container && cd $_ +git tag -a 'x.y.z' -m 'release x.y.z' +git push origin x.y.z +``` + +Releases are created and published automatically by a GitHub Action on tag +creation. Using the web interface to create a release will cause that +automation to fail. + # NPG Singularity wrappers Each container that provides command line programs is self-documenting