Merge pull request #44 from wtsi-npg/devel

pull from devel to master to prepare release 1.5.0

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 [email protected]: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

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

docker/Makefile

@@ -38,15 +38,16 @@ 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="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 $@