Skip to content

Commit ec10de3

Browse files
committed
Dockerfile label updates, change version string in RELEASE.txt
LABELS now use ci standard opencontainers naming for: vendor, description and version annotations. In version, source value was removed and source moved to description. Added annotations for: title licenses documentation licenses includes Python-2.0 license in preparation for vendoring cgi and cgitb modules in 2.4.0. Updated RELEASE.txt to include version string in Dockerfile.
1 parent 8b74486 commit ec10de3

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

RELEASE.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ Roundup release checklist:
3434
roundup/__init__.py
3535
website/www/index.txt (current stable version, release highlights)
3636
website/www/conf.py (update copyright, version from __init__.py)
37+
scripts/Docker/Docker update value of org.opencontainers.image.version
3738
3a. Update license end date in COPYING.txt
3839
3b. Update doc/acknowledgements.txt (add section for
3940
release, churn contributers etc.). (Use hg churn -c -r ####..####)

scripts/Docker/Dockerfile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,14 @@ RUN apk --no-cache upgrade; \
195195
fi
196196

197197
ARG source
198-
LABEL "org.roundup-tracker.vendor"="Roundup Issue Tracker Team" \
199-
"org.roundup-tracker.description"="Roundup Issue Tracker multi-backend" \
200-
"version"="2.2.0 $source" \
201-
"org.opencontainers.image.authors"="[email protected]"
198+
LABEL "org.opencontainers.image.vendor"="Roundup Issue Tracker Team" \
199+
"org.opencontainers.image.title"="Roundup Issue Tracker" \
200+
"org.opencontainers.image.description"="Roundup Issue Tracker with multi-backend support installed via $source" \
201+
"org.opencontainers.image.version"="2.2.0" \
202+
"org.opencontainers.image.authors"="[email protected]" \
203+
"org.opencontainers.image.licenses"="MIT AND ZPL-2.0 AND Python-2.0"
204+
"org.opencontainers.image.documentation"="https://www.roundup-tracker.org/docs/installation.html"
205+
202206

203207
ARG pythonversion
204208
# pull over built assets

0 commit comments

Comments
 (0)