Merge #275 - add some org.opencontainers.image.* labels

Pull-request: #275

Author: williamdes

.travis.yml

@@ -29,7 +29,7 @@ _helpers:
   stage: "Run tests in testing container"
   script:
     # Build image
-    - docker build -t phpmyadmin/phpmyadmin apache
+    - docker build --build-arg VCS_REF=`git rev-parse HEAD` --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -t phpmyadmin/phpmyadmin apache
     # Test for single database
     - docker run --name testadmin -d --link db_server:db -p 9090:80 phpmyadmin/phpmyadmin
     - ./testing/test-docker.sh testadmin 9090
@@ -71,17 +71,17 @@ jobs:
       name: "Apache amd64"
       arch: amd64
       script:
-      - docker build -t phpmyadmin/phpmyadmin apache
+      - docker build --build-arg VCS_REF=`git rev-parse HEAD` --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -t phpmyadmin/phpmyadmin apache
     - <<: *build-image
       name: "fpm amd64"
       arch: amd64
       script:
-      - docker build -t phpmyadmin/phpmyadmin fpm
+      - docker build --build-arg VCS_REF=`git rev-parse HEAD` --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -t phpmyadmin/phpmyadmin fpm
     - <<: *build-image
       name: "fpm-alpine amd64"
       arch: amd64
       script:
-      - docker build -t phpmyadmin/phpmyadmin fpm-alpine
+      - docker build --build-arg VCS_REF=`git rev-parse HEAD` --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -t phpmyadmin/phpmyadmin fpm-alpine
     - <<: *test-apache-image
       name: "Run testing for MariaDB"
       env: DB=mariadb:latest

Dockerfile-alpine.template

@@ -61,6 +61,21 @@ RUN set -ex; \
 # Calculate download URL
 ENV VERSION %%VERSION%%
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
+ARG BUILD_DATE
+ARG VCS_REF
+
+LABEL maintainer="The phpMyAdmin Team <developers@phpmyadmin.net>" \
+    org.opencontainers.image.title="Official phpMyAdmin Docker image" \
+    org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \
+    org.opencontainers.image.authors="The phpMyAdmin Team <developers@phpmyadmin.net>" \
+    org.opencontainers.image.vendor="phpMyAdmin" \
+    org.opencontainers.image.documentation="https://github.com/phpmyadmin/docker#readme" \
+    org.opencontainers.image.licenses="GPL-2.0-only" \
+    org.opencontainers.image.version="${VERSION}" \
+    org.opencontainers.image.url="https://github.com/phpmyadmin/docker#readme" \
+    org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git" \
+    org.opencontainers.image.revision="${VCS_REF}" \
+    org.opencontainers.image.created="${BUILD_DATE}"
 
 # Download tarball, verify it using gpg and extract
 RUN set -ex; \

Dockerfile-debian.template

@@ -64,6 +64,21 @@ RUN set -ex; \
 # Calculate download URL
 ENV VERSION %%VERSION%%
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
+ARG BUILD_DATE
+ARG VCS_REF
+
+LABEL maintainer="The phpMyAdmin Team <developers@phpmyadmin.net>" \
+    org.opencontainers.image.title="Official phpMyAdmin Docker image" \
+    org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \
+    org.opencontainers.image.authors="The phpMyAdmin Team <developers@phpmyadmin.net>" \
+    org.opencontainers.image.vendor="phpMyAdmin" \
+    org.opencontainers.image.documentation="https://github.com/phpmyadmin/docker#readme" \
+    org.opencontainers.image.licenses="GPL-2.0-only" \
+    org.opencontainers.image.version="${VERSION}" \
+    org.opencontainers.image.url="https://github.com/phpmyadmin/docker#readme" \
+    org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git" \
+    org.opencontainers.image.revision="${VCS_REF}" \
+    org.opencontainers.image.created="${BUILD_DATE}"
 
 # Download tarball, verify it using gpg and extract
 RUN set -ex; \

apache/Dockerfile

@@ -64,6 +64,21 @@ RUN set -ex; \
 # Calculate download URL
 ENV VERSION 5.0.1
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
+ARG BUILD_DATE
+ARG VCS_REF
+
+LABEL maintainer="The phpMyAdmin Team <developers@phpmyadmin.net>" \
+    org.opencontainers.image.title="Official phpMyAdmin Docker image" \
+    org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \
+    org.opencontainers.image.authors="The phpMyAdmin Team <developers@phpmyadmin.net>" \
+    org.opencontainers.image.vendor="phpMyAdmin" \
+    org.opencontainers.image.documentation="https://github.com/phpmyadmin/docker#readme" \
+    org.opencontainers.image.licenses="GPL-2.0-only" \
+    org.opencontainers.image.version="${VERSION}" \
+    org.opencontainers.image.url="https://github.com/phpmyadmin/docker#readme" \
+    org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git" \
+    org.opencontainers.image.revision="${VCS_REF}" \
+    org.opencontainers.image.created="${BUILD_DATE}"
 
 # Download tarball, verify it using gpg and extract
 RUN set -ex; \

fpm-alpine/Dockerfile

@@ -61,6 +61,21 @@ RUN set -ex; \
 # Calculate download URL
 ENV VERSION 5.0.1
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
+ARG BUILD_DATE
+ARG VCS_REF
+
+LABEL maintainer="The phpMyAdmin Team <developers@phpmyadmin.net>" \
+    org.opencontainers.image.title="Official phpMyAdmin Docker image" \
+    org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \
+    org.opencontainers.image.authors="The phpMyAdmin Team <developers@phpmyadmin.net>" \
+    org.opencontainers.image.vendor="phpMyAdmin" \
+    org.opencontainers.image.documentation="https://github.com/phpmyadmin/docker#readme" \
+    org.opencontainers.image.licenses="GPL-2.0-only" \
+    org.opencontainers.image.version="${VERSION}" \
+    org.opencontainers.image.url="https://github.com/phpmyadmin/docker#readme" \
+    org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git" \
+    org.opencontainers.image.revision="${VCS_REF}" \
+    org.opencontainers.image.created="${BUILD_DATE}"
 
 # Download tarball, verify it using gpg and extract
 RUN set -ex; \

fpm/Dockerfile

@@ -64,6 +64,21 @@ RUN set -ex; \
 # Calculate download URL
 ENV VERSION 5.0.1
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
+ARG BUILD_DATE
+ARG VCS_REF
+
+LABEL maintainer="The phpMyAdmin Team <developers@phpmyadmin.net>" \
+    org.opencontainers.image.title="Official phpMyAdmin Docker image" \
+    org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \
+    org.opencontainers.image.authors="The phpMyAdmin Team <developers@phpmyadmin.net>" \
+    org.opencontainers.image.vendor="phpMyAdmin" \
+    org.opencontainers.image.documentation="https://github.com/phpmyadmin/docker#readme" \
+    org.opencontainers.image.licenses="GPL-2.0-only" \
+    org.opencontainers.image.version="${VERSION}" \
+    org.opencontainers.image.url="https://github.com/phpmyadmin/docker#readme" \
+    org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git" \
+    org.opencontainers.image.revision="${VCS_REF}" \
+    org.opencontainers.image.created="${BUILD_DATE}"
 
 # Download tarball, verify it using gpg and extract
 RUN set -ex; \

hooks/build

@@ -0,0 +1,6 @@
+#!/bin/bash
+# This file is used by docker hub to build the image
+
+docker build --build-arg VCS_REF=`git rev-parse HEAD` \
+    --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+    -t $IMAGE_NAME .