mirror of
https://github.com/EpicMorg/docker-scripts.git
synced 2024-12-25 06:05:37 +03:00
Merge branch 'develop'
This commit is contained in:
commit
1d0c3e8e11
@ -5,17 +5,14 @@ ARG DEBIAN_FRONTEND=noninteractive
|
|||||||
##################################################################
|
##################################################################
|
||||||
# Build-time metadata as defined at http://label-schema.org
|
# Build-time metadata as defined at http://label-schema.org
|
||||||
##################################################################
|
##################################################################
|
||||||
ARG BUILD_DATE=today
|
LABEL org.label-schema.build-date=${date} \
|
||||||
ARG VCS_REF=master
|
|
||||||
ARG VERSION=latest
|
|
||||||
LABEL org.label-schema.build-date=$BUILD_DATE \
|
|
||||||
org.label-schema.name="Docker Scripts" \
|
org.label-schema.name="Docker Scripts" \
|
||||||
org.label-schema.description="Image for our docker containers." \
|
org.label-schema.description="Image for our docker containers." \
|
||||||
org.label-schema.url="https://ww.epicm.org/" \
|
org.label-schema.url="https://ww.epicm.org/" \
|
||||||
org.label-schema.vcs-ref=$VCS_REF \
|
org.label-schema.vcs-ref=master \
|
||||||
org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
|
org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
|
||||||
org.label-schema.vendor="EpicMorg" \
|
org.label-schema.vendor="EpicMorg" \
|
||||||
org.label-schema.version=$VERSION \
|
org.label-schema.version=1.17.8 \
|
||||||
org.label-schema.schema-version="1.0"
|
org.label-schema.schema-version="1.0"
|
||||||
|
|
||||||
##################################################################
|
##################################################################
|
||||||
@ -178,17 +175,14 @@ ARG DEBIAN_FRONTEND=noninteractive
|
|||||||
##################################################################
|
##################################################################
|
||||||
# Build-time metadata as defined at http://label-schema.org
|
# Build-time metadata as defined at http://label-schema.org
|
||||||
##################################################################
|
##################################################################
|
||||||
ARG BUILD_DATE=today
|
LABEL org.label-schema.build-date=${date} \
|
||||||
ARG VCS_REF=master
|
|
||||||
ARG VERSION=latest
|
|
||||||
LABEL org.label-schema.build-date=$BUILD_DATE \
|
|
||||||
org.label-schema.name="Docker Scripts" \
|
org.label-schema.name="Docker Scripts" \
|
||||||
org.label-schema.description="Image for our docker containers." \
|
org.label-schema.description="Image for our docker containers." \
|
||||||
org.label-schema.url="https://ww.epicm.org/" \
|
org.label-schema.url="https://ww.epicm.org/" \
|
||||||
org.label-schema.vcs-ref=$VCS_REF \
|
org.label-schema.vcs-ref=master \
|
||||||
org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
|
org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
|
||||||
org.label-schema.vendor="EpicMorg" \
|
org.label-schema.vendor="EpicMorg" \
|
||||||
org.label-schema.version=$VERSION \
|
org.label-schema.version=1.17.8 \
|
||||||
org.label-schema.schema-version="1.0"
|
org.label-schema.schema-version="1.0"
|
||||||
|
|
||||||
##################################################################
|
##################################################################
|
||||||
|
@ -5,17 +5,14 @@ ARG DEBIAN_FRONTEND=noninteractive
|
|||||||
##################################################################
|
##################################################################
|
||||||
# Build-time metadata as defined at http://label-schema.org
|
# Build-time metadata as defined at http://label-schema.org
|
||||||
##################################################################
|
##################################################################
|
||||||
ARG BUILD_DATE=today
|
LABEL org.label-schema.build-date=${date} \
|
||||||
ARG VCS_REF=master
|
|
||||||
ARG VERSION=latest
|
|
||||||
LABEL org.label-schema.build-date=$BUILD_DATE \
|
|
||||||
org.label-schema.name="Docker Scripts" \
|
org.label-schema.name="Docker Scripts" \
|
||||||
org.label-schema.description="Image for our docker containers." \
|
org.label-schema.description="Image for our docker containers." \
|
||||||
org.label-schema.url="https://ww.epicm.org/" \
|
org.label-schema.url="https://ww.epicm.org/" \
|
||||||
org.label-schema.vcs-ref=$VCS_REF \
|
org.label-schema.vcs-ref=master \
|
||||||
org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
|
org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
|
||||||
org.label-schema.vendor="EpicMorg" \
|
org.label-schema.vendor="EpicMorg" \
|
||||||
org.label-schema.version=$VERSION \
|
org.label-schema.version=1.17.8 \
|
||||||
org.label-schema.schema-version="1.0"
|
org.label-schema.schema-version="1.0"
|
||||||
|
|
||||||
##################################################################
|
##################################################################
|
||||||
|
Loading…
Reference in New Issue
Block a user