Add pangolin 4.4 with pangolin-data 1.39#1700
Merged
Merged
Conversation
Collaborator
Author
|
@staphb-dockerbuilds-diff pangolin 4.4-pdata-1.39 4.4-pdata-1.38 |
Dockerfile Diff: pangolinComparing: 4.4-pdata-1.39 -> 4.4-pdata-1.38 --- build-files/pangolin/4.4-pdata-1.39/Dockerfile 2026-06-10 17:52:25.893776613 +0000
+++ build-files/pangolin/4.4-pdata-1.38/Dockerfile 2026-06-10 17:52:25.893511575 +0000
@@ -1,4 +1,4 @@
-FROM mambaorg/micromamba:2.8.1-ubuntu24.04 AS app
+FROM mambaorg/micromamba:2.5.0-ubuntu24.04 AS app
# build and run as root users since micromamba image has 'mambauser' set as the $USER
USER root
@@ -9,31 +9,22 @@
# had to include the v for some of these due to GitHub tags.
# using pangolin-data github tag, NOT what is in the GH release title "v1.2.133"
ARG PANGOLIN_VER="v4.4"
-ARG PANGOLIN_DATA_VER="v1.39"
+ARG PANGOLIN_DATA_VER="v1.38"
ARG SCORPIO_VER="v0.3.19"
ARG CONSTELLATIONS_VER="v0.1.12"
ARG USHER_VER="0.6.3"
-# metadata labels for the image; using OCI labels spec:
-LABEL \
-# The exact base image used for the 'app' stage
-org.opencontainers.image.base.name="mambaorg/micromamba:2.8.1-ubuntu24.04" \
-# The name of the software (e.g., "BWA" or "Samtools")
-org.opencontainers.image.title="pangolin" \
-# The version of the software itself
-org.opencontainers.image.version="${PANGOLIN_VER}" \
-# The version of THIS Dockerfile (increment if you change the build logic)
-org.opencontainers.image.revision="1" \
-# A human-readable description of the tool
-org.opencontainers.image.description="Conda environment for Pangolin. Pangolin: Software package for assigning SARS-CoV-2 genome sequences to global lineages." \
-# The project homepage or GitHub repository
-org.opencontainers.image.url="https://github.com/cov-lineages/pangolin" \
-# Where users can find instructions or manuals for the software
-org.opencontainers.image.documentation="https://github.com/cov-lineages/pangolin" \
-# The software license (e.g., MIT, GPL-3.0, Apache-2.0) for the software
-org.opencontainers.image.licenses="GPL-3.0" \
-# The person/group maintaining this Dockerfile
-org.opencontainers.image.authors="Curtis Kapsak <kapsakcj@gmail.com>"
+# metadata labels
+LABEL base.image="mambaorg/micromamba:2.5.0-ubuntu24.04"
+LABEL dockerfile.version="1"
+LABEL software="pangolin"
+LABEL software.version=${PANGOLIN_VER}
+LABEL description="Conda environment for Pangolin. Pangolin: Software package for assigning SARS-CoV-2 genome sequences to global lineages."
+LABEL website="https://github.com/cov-lineages/pangolin"
+LABEL license="GNU General Public License v3.0"
+LABEL license.url="https://github.com/cov-lineages/pangolin/blob/master/LICENSE.txt"
+LABEL maintainer="Curtis Kapsak"
+LABEL maintainer.email="kapsakcj@gmail.com"
# install dependencies; cleanup apt garbage
RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -133,9 +124,8 @@
# XFG.3.5 | PX025687.1 | introduced in pango-designation 1.35 https://github.com/cov-lineages/pango-designation/commit/cb430033b29f760b7f013ff7114790c5b4b6f9b4
# XFG.5.1.4 | PV979512.1 | introduced in pango-designation 1.36 https://github.com/cov-lineages/pango-designation/commit/9bc6a238df1bcda12f548b239a86c7ce7fbcf2a3
# PQ.17.11 | PX697933.1 | introduced in pango-designation 1.37 https://github.com/cov-lineages/pango-designation/commit/38e4ffc100689e8979c786623e62a1d2887f46e9
-# XFG.6.14 | PX670354.1 | introduced in pango-designation 1.39 https://github.com/cov-lineages/pango-designation/commit/2079448d187e4f5308953a529cb24936723eeeac
# sed is to make output more readable by removing extra text in sequence names
-RUN datasets download virus genome accession ON924087.1,OQ381818.1,OR177999.1,OR461132.1,OR598183.1,OR716684.1,PP189069.1,PP218754.1,PQ073669.1,PP770375.1,PQ034842.1,PQ277908.1,PQ725776.1,PV666687.1,PX025687.1,PV979512.1,PX697933.1,PX670354.1 && \
+RUN datasets download virus genome accession ON924087.1,OQ381818.1,OR177999.1,OR461132.1,OR598183.1,OR716684.1,PP189069.1,PP218754.1,PQ073669.1,PP770375.1,PQ034842.1,PQ277908.1,PQ725776.1,PV666687.1,PX025687.1,PV979512.1,PX697933.1 && \
unzip -o ncbi_dataset.zip && \
rm -v ncbi_dataset.zip && \
pangolin ncbi_dataset/data/genomic.fna && \ |
Contributor
|
New labels! The following are intended to be added by the "deploy" github action in #1652, and so are not included in the template. I will add these tomorrow and get this deployed and merged. |
Contributor
|
Tests worked |
erinyoung
approved these changes
Jun 11, 2026
erinyoung
left a comment
Contributor
There was a problem hiding this comment.
The labels cause the github actions to fail, but this is otherwise a functional image. I will approve and get this merged.
Collaborator
Author
|
thank you for adding those labels and reviewing! |
Contributor
|
Thank you for putting this together! You can check the status of the deploy here : https://github.com/StaPH-B/docker-builds/actions/runs/27360846336 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Draft for now.Docker image builds successfully.Need to update LABELS.Ready for review.
LABELs have been updated to match those listed in PR https://github.com/StaPH-B/docker-builds/pull/1651/changes
The main change is upgrade to pangolin-data v1.39. I have added an additional test for a lineage (XFG.6.14) defined in 1.39
Also upgraded the micromamba base image to the latest version 2.8.1
GHActions test started failing after I updated the LABELs to the OCI spec. Should be OK to merge regardless - the image builds and tests run successfully
Pull Request (PR) checklist:
docker build --tag samtools:1.15test --target test docker-builds/build-files/samtools/1.15)docker-builds/build-files/spades/3.12.0/Dockerfile)build-files/shigatyper/2.0.1/test.sh)docker-builds/build-files/spades/3.12.0/README.md)