Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-06-10 21:19:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Introduce "common.label-and-env"

Browse Source 
This will simply the removal of deprecated "org.label-schema" annotation [1]
and the introduction of open containers ones [2]

[1] http://label-schema.org/rc1/
[2] https://github.com/opencontainers/image-spec/blob/master/annotations.md
This commit is contained in:
Jean-Christophe Fillion-Robin
2020-05-06 20:21:14 -04:00
committed by Jonas Vautherin
parent 1fb2785377
commit 68b4549a50
28 changed files with 114 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -22,7 +22,7 @@ GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES))
# These images are expected to have explicit rules for *both* build and testing
NON_STANDARD_IMAGES = web-wasm manylinux1-x64 manylinux1-x86 manylinux2010-x64 manylinux2010-x86 manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64
DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux common.crosstool common.windows common-manylinux.crosstool common.dockcross
DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux common.crosstool common.windows common-manylinux.crosstool common.dockcross common.label-and-env
# This list all available images
IMAGES = $(STANDARD_IMAGES) $(NON_STANDARD_IMAGES)
@ -69,6 +69,7 @@ $(GEN_IMAGE_DOCKERFILES) Dockerfile: %Dockerfile: %Dockerfile.in $(DOCKER_COMPOS
-e '/common-manylinux.crosstool/ r common-manylinux.crosstool' \
-e '/common.windows/ r common.windows' \
-e '/common.dockcross/ r common.dockcross' \
-e '/common.label-and-env/ r common.label-and-env' \
$< > $@
#